leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Don't relocate symbols which point to things that aren't relocated

Browse Source 
This change adds an upper bound for symbols which are fixed up after u-boot
is relocated into RAM. This way portions that are left at their original
location can be referred to without having to manually fix up any pointers.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
This commit is contained in:
Gabe Black 2011-11-12 16:34:48 +00:00 committed by Graeme Russ
parent 03228b26d5
commit 769db03a4a
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/lib/bios_setup.c
View File

@ -78,11 +78,8 @@ static void setvector(int vector, u16 segment, void *handler)
int bios_setup(void)
{
/*
* The BIOS section is not relocated and still in the ROM. The
* __bios_start symbol was adjusted, though, so adjust it back.
*/
ulong bios_start = (ulong)&__bios_start - gd->reloc_off;
/* The BIOS section is not relocated and still in the ROM. */
ulong bios_start = (ulong)&__bios_start;
ulong bios_size = (ulong)&__bios_size;
static int done;

5
arch/x86/lib/board.c
View File

@ -231,8 +231,11 @@ static int do_elf_reloc_fixups(void)
offset_ptr_ram = offset_ptr_rom + gd->reloc_off;
/* Check that the target points into .text */
if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE)
if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&
*offset_ptr_ram <
(CONFIG_SYS_TEXT_BASE + size)) {
*offset_ptr_ram += gd->reloc_off;
}
}
} while (re_src++ < re_end);

7
arch/x86/lib/realmode.c
View File

@ -30,11 +30,8 @@
int realmode_setup(void)
{
/*
* The realmode section is not relocated and still in the ROM. The
* __realmode_start symbol was adjusted, though, so adjust it back.
*/
ulong realmode_start = (ulong)&__realmode_start - gd->reloc_off;
/* The realmode section is not relocated and still in the ROM. */
ulong realmode_start = (ulong)&__realmode_start;
ulong realmode_size = (ulong)&__realmode_size;
/* copy the realmode switch code */