Eep - This is a stand-alone patch and not part of a multi-part patch series
(forgot to edit the subject)
Regards,
Graeme
On 17/11/11 20:32, Graeme Russ wrote:
> From: Gabe Black <gabebl...@chromium.org>
>
> Signed-off-by: Gabe Black <gabebl...@chromium.org>
> Signed-off-by: Graeme Russ <graeme.r...@gmail.com>
> ---
> arch/x86/cpu/cpu.c | 1 +
> arch/x86/lib/board.c | 6 +++++-
> 2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
> index 48d2f7a..61d0b69 100644
> --- a/arch/x86/cpu/cpu.c
> +++ b/arch/x86/cpu/cpu.c
> @@ -37,6 +37,7 @@
> #include <asm/processor.h>
> #include <asm/processor-flags.h>
> #include <asm/interrupt.h>
> +#include <linux/compiler.h>
>
> /*
> * Constructor for a conventional segment GDT (or LDT) entry
> diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
> index 18e0ede..d742fec 100644
> --- a/arch/x86/lib/board.c
> +++ b/arch/x86/lib/board.c
> @@ -220,6 +220,9 @@ static int do_elf_reloc_fixups(void)
> Elf32_Addr *offset_ptr_rom;
> Elf32_Addr *offset_ptr_ram;
>
> + /* The size of the region of u-boot that runs out of RAM. */
> + uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
> +
> do {
> /* Get the location from the relocation entry */
> offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
> @@ -228,7 +231,8 @@ static int do_elf_reloc_fixups(void)
> if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) {
>
> /* Switch to the in-RAM version */
> - offset_ptr_ram = offset_ptr_rom + gd->reloc_off;
> + offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
> + gd->reloc_off);
>
> /* Check that the target points into .text */
> if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
