summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2013-04-11 09:35:42 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 07:55:05 +0200
commit508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac (patch)
treea9809db7b9be19e98f90ba01fd9f56bc393fffa2 /arch/arm/cpu/pxa
parent3ec9d6eb09ca799f2632a58012ef9603982a642d (diff)
downloadtalos-obmc-uboot-508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac.tar.gz
talos-obmc-uboot-508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac.zip
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>
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/start.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 456a7836da..2e2afd7813 100644
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@@ -102,7 +102,7 @@ _end_vect:
.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
OpenPOWER on IntegriCloud