ARM: dts: stm32: Repair SDMMC1 operation on AV96

[oweals/u-boot.git] / arch / arm / lib / crt0.S

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index fe312db69068b4e0d41eb0d9bafccc3b0e05b248..fb6c37cf519494aa55a562354e066dcf434ddce6 100644 (file)
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -57,6 +57,33 @@
  * For more information see 'Board Initialisation Flow in README.
  */
 
+/*
+ * Macro for clearing BSS during SPL execution. Usually called during the
+ * relocation process for most boards before entering board_init_r(), but
+ * can also be done early before entering board_init_f() on plaforms that
+ * can afford it due to sufficient memory being available early.
+ */
+
+.macro SPL_CLEAR_BSS
+       ldr     r0, =__bss_start        /* this is auto-relocated! */
+
+#ifdef CONFIG_USE_ARCH_MEMSET
+       ldr     r3, =__bss_end          /* this is auto-relocated! */
+       mov     r1, #0x00000000         /* prepare zero to clear BSS */
+
+       subs    r2, r3, r0              /* r2 = memset len */
+       bl      memset
+#else
+       ldr     r1, =__bss_end          /* this is auto-relocated! */
+       mov     r2, #0x00000000         /* prepare zero to clear BSS */
+
+clbss_l:cmp    r0, r1                  /* while not at end of BSS */
+       strlo   r2, [r0]                /* clear 32-bit BSS word */
+       addlo   r0, r0, #4              /* move to next */
+       blo     clbss_l
+#endif
+.endm
+
 /*
  * entry point of crt0 sequence
  */
@@ -67,7 +94,9 @@ ENTRY(_main)
  * Set up initial C runtime environment and call board_init_f(0).
  */
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
+#if defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_NEEDS_SEPARATE_STACK)
+       ldr     r0, =(CONFIG_TPL_STACK)
+#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
        ldr     r0, =(CONFIG_SPL_STACK)
 #else
        ldr     r0, =(CONFIG_SYS_INIT_SP_ADDR)
@@ -80,6 +109,10 @@ ENTRY(_main)
        mov     r9, r0
        bl      board_init_f_init_reserve
 
+#if defined(CONFIG_SPL_EARLY_BSS)
+       SPL_CLEAR_BSS
+#endif
+
        mov     r0, #0
        bl      board_init_f
 
@@ -116,7 +149,12 @@ here:
 
        bl      c_runtime_cpu_setup     /* we still call old routine here */
 #endif
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FRAMEWORK)
+#if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(FRAMEWORK)
+
+#if !defined(CONFIG_SPL_EARLY_BSS)
+       SPL_CLEAR_BSS
+#endif
+
 # ifdef CONFIG_SPL_BUILD
        /* Use a DRAM stack for the rest of SPL, if requested */
        bl      spl_relocate_stack_gd
@@ -124,23 +162,6 @@ here:
        movne   sp, r0
        movne   r9, r0
 # endif
-       ldr     r0, =__bss_start        /* this is auto-relocated! */
-
-#ifdef CONFIG_USE_ARCH_MEMSET
-       ldr     r3, =__bss_end          /* this is auto-relocated! */
-       mov     r1, #0x00000000         /* prepare zero to clear BSS */
-
-       subs    r2, r3, r0              /* r2 = memset len */
-       bl      memset
-#else
-       ldr     r1, =__bss_end          /* this is auto-relocated! */
-       mov     r2, #0x00000000         /* prepare zero to clear BSS */
-
-clbss_l:cmp    r0, r1                  /* while not at end of BSS */
-       strlo   r2, [r0]                /* clear 32-bit BSS word */
-       addlo   r0, r0, #4              /* move to next */
-       blo     clbss_l
-#endif
 
 #if ! defined(CONFIG_SPL_BUILD)
        bl coloured_LED_init