diff options
author | Tom Rini <trini@ti.com> | 2012-12-07 06:43:40 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2012-12-07 08:47:59 -0700 |
commit | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (patch) | |
tree | a42d63aae4f7c07f441321c18098a85cbcc45dee /arch/x86/lib/relocate.c | |
parent | 13d43555a9154cf12255023c47e80d947d7d0604 (diff) | |
parent | ac426b7290e3a96c97fbc093f15cd0660e0edaf2 (diff) | |
download | u-boot-imx-fd4d564b3c80b111f18c93adb14233a6a7ddb0e9.zip u-boot-imx-fd4d564b3c80b111f18c93adb14233a6a7ddb0e9.tar.gz u-boot-imx-fd4d564b3c80b111f18c93adb14233a6a7ddb0e9.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/relocate.c')
-rw-r--r-- | arch/x86/lib/relocate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 200baab..23edca9 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -80,12 +80,12 @@ int do_elf_reloc_fixups(void) /* Check that the target points into .text */ if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE && - *offset_ptr_ram < + *offset_ptr_ram <= (CONFIG_SYS_TEXT_BASE + size)) { *offset_ptr_ram += gd->reloc_off; } } - } while (re_src++ < re_end); + } while (++re_src < re_end); return 0; } |