From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Thu, 8 Jun 2017 08:18:25 +0000 (+0200)
Subject: board_f: fix calculation of reloc_off
X-Git-Tag: v2017.07-rc2~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53207bfd704250354c56aa74c7e96151fddee1f1;p=u-boot

board_f: fix calculation of reloc_off

relocate_code() calculates the relocation offset wrt. the symbol
__image_copy_start which happens to have the same value as
CONFIG_TEXT_BASE on most systems.
When creating an i.MX boot image with an integrated IVT it is
convenient to have CONFIG_TEXT_BASE point to the start of the IVT
that is prepended to the actual code. Thus CONFIG_TEXT_BASE will
differ from __image_copy_start, while the calculation
'gd->relocaddr - __image_copy_start' still gives the right relocation
offset.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---

diff --git a/common/board_f.c b/common/board_f.c
index f5054985d0..8bf9acca48 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -644,13 +644,16 @@ static int setup_reloc(void)
 	}
 
 #ifdef CONFIG_SYS_TEXT_BASE
-	gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
-#ifdef CONFIG_M68K
+#ifdef ARM
+	gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
+#elif defined(CONFIG_M68K)
 	/*
 	 * On all ColdFire arch cpu, monitor code starts always
 	 * just after the default vector table location, so at 0x400
 	 */
 	gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
+#else
+	gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #endif
 #endif
 	memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));