commit 508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac
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 3ec9d6eb09ca799f2632a58012ef9603982a642d

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/pxa/start.S

diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 456a783..2e2afd7 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -102,7 +102,7 @@
 
 .globl _TEXT_BASE
 _TEXT_BASE:
-#ifdef	CONFIG_SPL_BUILD
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE)
 	.word	CONFIG_SPL_TEXT_BASE
 #else
 	.word	CONFIG_SYS_TEXT_BASE