diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2013-04-11 09:35:42 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 07:55:05 +0200 |
| commit | 508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac (patch) | |
| tree | a9809db7b9be19e98f90ba01fd9f56bc393fffa2 /arch/arm/cpu/arm1176/start.S | |
| parent | 3ec9d6eb09ca799f2632a58012ef9603982a642d (diff) | |
| download | blackbird-obmc-uboot-508611bcb7d2a0fd5e7ead35c45f68b6e6c101ac.tar.gz blackbird-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/arm1176/start.S')
| -rw-r--r-- | arch/arm/cpu/arm1176/start.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 3c291fbe42..accccdc2df 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -98,7 +98,15 @@ _end_vect: .globl _TEXT_BASE _TEXT_BASE: +#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */ .word CONFIG_SYS_TEXT_BASE +#else +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) + .word CONFIG_SPL_TEXT_BASE +#else + .word CONFIG_SYS_TEXT_BASE +#endif +#endif /* * Below variable is very important because we use MMU in U-Boot. |
