Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[oweals/u-boot.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 1872c57699577bcf107753fb48ff1a2dbde63ac1..ba4b374a8bd9a5315bf3065e5e7715a72458d50c 100644 (file)
--- a/arch/arm/cpu/armv7/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/lowlevel_init.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * A lowlevel_init function that sets up the stack to call a C function to
  * perform further init.
@@ -7,19 +8,28 @@
  *
  * Author :
  *     Aneesh V        <aneesh@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <asm-offsets.h>
 #include <config.h>
 #include <linux/linkage.h>
 
-ENTRY(lowlevel_init)
+.pushsection .text.s_init, "ax"
+WEAK(s_init)
+       bx      lr
+ENDPROC(s_init)
+.popsection
+
+.pushsection .text.lowlevel_init, "ax"
+WEAK(lowlevel_init)
        /*
         * Setup a temporary stack. Global data is not available yet.
         */
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
+       ldr     sp, =CONFIG_SPL_STACK
+#else
        ldr     sp, =CONFIG_SYS_INIT_SP_ADDR
+#endif
        bic     sp, sp, #7 /* 8-byte alignment for ABI compliance */
 #ifdef CONFIG_SPL_DM
        mov     r9, #0
@@ -57,3 +67,4 @@ ENTRY(lowlevel_init)
        bl      s_init
        pop     {ip, pc}
 ENDPROC(lowlevel_init)
+.popsection