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

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

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index 4c3a94af572c58b4938885c0258b8ddd9ce13053..8415f77e1b1e02b5159b3059dd19c572ccb16098 100644 (file)
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -82,31 +82,14 @@ ENTRY(_main)
 #else
        bic     sp, sp, #7      /* 8-byte alignment for ABI compliance */
 #endif
-       mov     r2, sp
-       sub     sp, sp, #GD_SIZE        /* allocate one GD above SP */
-#if defined(CONFIG_CPU_V7M)    /* v7M forbids using SP as BIC destination */
-       mov     r3, sp
-       bic     r3, r3, #7
-       mov     sp, r3
-#else
-       bic     sp, sp, #7      /* 8-byte alignment for ABI compliance */
-#endif
-       mov     r9, sp          /* GD is above SP */
-       mov     r1, sp
+       mov     r0, sp
+       bl      board_init_f_alloc_reserve
+       mov     sp, r0
+       /* set up gd here, outside any C code */
+       mov     r9, r0
+       bl      board_init_f_init_reserve
+
        mov     r0, #0
-clr_gd:
-       cmp     r1, r2                  /* while not at end of GD */
-#if defined(CONFIG_CPU_V7M)
-       itt     lo
-#endif
-       strlo   r0, [r1]                /* clear 32-bit GD word */
-       addlo   r1, r1, #4              /* move to next */
-       blo     clr_gd
-#if defined(CONFIG_SYS_MALLOC_F_LEN)
-       sub     sp, sp, #CONFIG_SYS_MALLOC_F_LEN
-       str     sp, [r9, #GD_MALLOC_BASE]
-#endif
-       /* mov r0, #0 not needed due to above code */
        bl      board_init_f
 
 #if ! defined(CONFIG_SPL_BUILD)
@@ -153,6 +136,7 @@ here:
        bl      spl_relocate_stack_gd
        cmp     r0, #0
        movne   sp, r0
+       movne   r9, r0
 # endif
        ldr     r0, =__bss_start        /* this is auto-relocated! */
 
@@ -183,8 +167,12 @@ clbss_l:cmp        r0, r1                  /* while not at end of BSS */
        mov     r0, r9                  /* gd_t */
        ldr     r1, [r9, #GD_RELOCADDR] /* dest_addr */
        /* call board_init_r */
+#if defined(CONFIG_SYS_THUMB_BUILD)
+       ldr     lr, =board_init_r       /* this is auto-relocated! */
+       bx      lr
+#else
        ldr     pc, =board_init_r       /* this is auto-relocated! */
-
+#endif
        /* we should not return here. */
 #endif