diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-11-12 16:34:48 +0000 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-11-29 21:30:44 +1100 |
| commit | 769db03a4a4ea1dc7e43c089c2227a0c8b4ffcbc (patch) | |
| tree | dc6c62ac0b9f6c24e566a0057a115daba078f1c2 /arch/x86/lib/bios_setup.c | |
| parent | 03228b26d5d999b05ea6e5946ad0375715b9043c (diff) | |
| download | blackbird-obmc-uboot-769db03a4a4ea1dc7e43c089c2227a0c8b4ffcbc.tar.gz blackbird-obmc-uboot-769db03a4a4ea1dc7e43c089c2227a0c8b4ffcbc.zip | |
x86: Don't relocate symbols which point to things that aren't relocated
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>
Diffstat (limited to 'arch/x86/lib/bios_setup.c')
| -rw-r--r-- | arch/x86/lib/bios_setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/lib/bios_setup.c b/arch/x86/lib/bios_setup.c index 0dfe4a1031..265f7d671e 100644 --- a/arch/x86/lib/bios_setup.c +++ b/arch/x86/lib/bios_setup.c @@ -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; |
