armv8: fsl: move ccn504 code into FSL Makefile

[u-boot] / arch / arm / lib / crt0_64.S

diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index 8b34e04dadae398179d756b108d4838880b193e3..57e728f9f2a36be2781442b4a9f4da3204fad1c1 100644 (file)
--- a/arch/arm/lib/crt0_64.S
+++ b/arch/arm/lib/crt0_64.S
@@ -73,20 +73,15 @@ ENTRY(_main)
        ldr     x0, =(CONFIG_SPL_STACK)
 #else
        ldr     x0, =(CONFIG_SYS_INIT_SP_ADDR)
-#endif
-       sub     x18, x0, #GD_SIZE       /* allocate one GD above SP */
-       bic     x18, x18, #0x7          /* 8-byte alignment for GD */
-zero_gd:
-       sub     x0, x0, #0x8
-       str     xzr, [x0]
-       cmp     x0, x18
-       b.gt    zero_gd
-#if defined(CONFIG_SYS_MALLOC_F_LEN)
-       ldr     x0, =CONFIG_SYS_MALLOC_F_LEN
-       sub     x0, x18, x0
-       str     x0, [x18, #GD_MALLOC_BASE]
 #endif
        bic     sp, x0, #0xf    /* 16-byte alignment for ABI compliance */
+       mov     x0, sp
+       bl      board_init_f_alloc_reserve
+       mov     sp, x0
+       /* set up gd here, outside any C code */
+       mov     x18, x0
+       bl      board_init_f_init_reserve
+
        mov     x0, #0
        bl      board_init_f
 
@@ -113,18 +108,27 @@ relocation_return:
  * Set up final (full) environment
  */
        bl      c_runtime_cpu_setup             /* still call old routine */
-
-/* TODO: For SPL, call spl_relocate_stack_gd() to alloc stack relocation */
+#endif /* !CONFIG_SPL_BUILD */
+#if defined(CONFIG_SPL_BUILD)
+       bl      spl_relocate_stack_gd           /* may return NULL */
+       /*
+        * Perform 'sp = (x0 != NULL) ? x0 : sp' while working
+        * around the constraint that conditional moves can not
+        * have 'sp' as an operand
+        */
+       mov     x1, sp
+       cmp     x0, #0
+       csel    x0, x0, x1, ne
+       mov     sp, x0
+#endif
 
 /*
  * Clear BSS section
  */
        ldr     x0, =__bss_start                /* this is auto-relocated! */
        ldr     x1, =__bss_end                  /* this is auto-relocated! */
-       mov     x2, #0
 clear_loop:
-       str     x2, [x0]
-       add     x0, x0, #8
+       str     xzr, [x0], #8
        cmp     x0, x1
        b.lo    clear_loop
 
@@ -135,6 +139,4 @@ clear_loop:
 
        /* NOTREACHED - board_init_r() does not return */
 
-#endif /* !CONFIG_SPL_BUILD */
-
 ENDPROC(_main)