merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / lowlevel_init.S

diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S
index 82b2b86520eb2b2d63c2478145b625a49f931542..cf477a978f56fc2fb0a72359665799984bc11648 100644 (file)
--- a/arch/arm/cpu/armv7/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/lowlevel_init.S
@@ -19,7 +19,11 @@ ENTRY(lowlevel_init)
        /*
         * Setup a temporary stack
         */
+#ifndef CONFIG_SPL_BUILD
        ldr     sp, =CONFIG_SYS_INIT_SP_ADDR
+#else
+       ldr     sp, =CONFIG_SPL_STACK
+#endif
        bic     sp, sp, #7 /* 8-byte alignment for ABI compliance */
 #ifdef CONFIG_SPL_BUILD
        ldr     r8, =gdata