commit a402da356eead026d27df1691c4999ca97870e1c
author Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Thu Apr 11 09:35:42 2013 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Fri Apr 12 07:55:05 2013 +0200
tree a9809db7b9be19e98f90ba01fd9f56bc393fffa2
parent 4b0dbbab12439f320e2a5e4b26d268b1d2bf544b

arm: start.S: Fix _TEXT_BASE for SPL

_TEXT_BASE must be set to CONFIG_SPL_TEXT_BASE for generic SPL, and to
CONFIG_SYS_TEXT_BASE for non-SPL builds.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Reviewed-by: Tom Rini <trini@ti.com>

arch/arm/cpu/arm_intcm/start.S

diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index 04d0845..a69fb17 100644
--- a/arch/arm/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
@@ -85,7 +85,11 @@
 
 .globl _TEXT_BASE
 _TEXT_BASE:
-	.word	CONFIG_SYS_TEXT_BASE /* address of _start in the linked image */
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE)
+	.word	CONFIG_SPL_TEXT_BASE
+#else
+	.word	CONFIG_SYS_TEXT_BASE
+#endif
 
 /*
  * These are defined in the board-specific linker script.