From: Simon Glass <sjg@chromium.org>
Date: Mon, 16 Jan 2017 14:03:52 +0000 (-0700)
Subject: x86: Do relocation before clearing BSS
X-Git-Tag: v2017.03-rc2~88
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6bda55a38ce4d9c5fcab5a5011e06469662954b3;p=u-boot

x86: Do relocation before clearing BSS

The BSS region may overlap with relocations. If we clear BSS we will
overwrite the start of the relocation area. This doesn't matter when running
from SPI flash, since it is read-only. But when relocating 64-bit U-Boot
from one place in RAM to another, relocation will fail because some of its
relocations have been zeroed.

To fix this, put the ELF fixup call before the BSS clearing call.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/common/board_f.c b/common/board_f.c
index 62cdd8cf8f..ae6cd8528c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -1033,8 +1033,8 @@ static const init_fnc_t init_sequence_f[] = {
 	setup_reloc,
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
 	copy_uboot_to_ram,
-	clear_bss,
 	do_elf_reloc_fixups,
+	clear_bss,
 #endif
 #if defined(CONFIG_XTENSA)
 	clear_bss,