[U-Boot] [PATCH] arm: Allow u-boot to run from offset base address

[Darwin Rambo <drambo@broadcom.com>]

If an earlier loader stage requires an image header and a specific
offset, then u-boot's base address (CONFIG_SYS_TEXT_BASE) may be
advanced beyond an aligned address. In this case the relocation
will not be done correctly for some sections such as vectors and rodata
string tables, which will show an incorrect offset after the symbols
are fixed up. Advance the relocation address by the image offset so that
the gd->reloc_off used will result in relocating these sections to their
correct addresses.

This change is done under CONFIG_ARM64 conditional compilation
because it has only been tested there and may not be appropriate
for other architectures.

Signed-off-by: Darwin Rambo <drambo@broadcom.com>
Reviewed-by: Steve Rae <srae@broadcom.com>
---

 arch/arm/lib/board.c |   13 +++++++++++++
 common/board_f.c     |   10 ++++++++++
 2 files changed, 23 insertions(+)

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 9b473b5..df520cc 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -449,6 +449,19 @@ void board_init_f(ulong bootflag)
 	dram_init_banksize();
 	display_dram_config();	/* and display it */
 
+#ifdef CONFIG_ARM64
+	/*
+	 * Fix relocation if u-boot is not on an aligned address.
+	 */
+	{
+		int offset = CONFIG_SYS_TEXT_BASE % 4096;
+		if (offset) {
+			addr += offset;
+			debug("Relocation Addr bumped to 0x%08lx\n", addr);
+		}
+	}
+#endif
+
 	gd->relocaddr = addr;
 	gd->start_addr_sp = addr_sp;
 	gd->reloc_off = addr - (ulong)&_start;
diff --git a/common/board_f.c b/common/board_f.c
index 4ea4cb2..1035d6f 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -728,6 +728,16 @@ static int reloc_fdt(void)
 
 static int setup_reloc(void)
 {
+#ifdef CONFIG_ARM64
+	/*
+	 * Fix relocation if u-boot is not on an aligned address.
+	 */
+	int offset = CONFIG_SYS_TEXT_BASE % 4096;
+	if (offset) {
+		gd->relocaddr += offset;
+		debug("Relocation Addr bumped to 0x%08lx\n", gd->relocaddr);
+	}
+#endif
 	gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 	memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
 
-- 
1.7.9.5