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

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

diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index b4fc760609700d122e731d0e49e3f20556a4a0a3..91b19e00da22cd12a68991cc40680de0736651ca 100644 (file)
--- a/arch/arm/lib/crt0_64.S
+++ b/arch/arm/lib/crt0_64.S
@@ -78,6 +78,8 @@ ENTRY(_main)
        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
@@ -106,6 +108,7 @@ relocation_return:
  * Set up final (full) environment
  */
        bl      c_runtime_cpu_setup             /* still call old routine */
+#endif /* !CONFIG_SPL_BUILD */
 
 /* TODO: For SPL, call spl_relocate_stack_gd() to alloc stack relocation */
 
@@ -128,6 +131,4 @@ clear_loop:
 
        /* NOTREACHED - board_init_r() does not return */
 
-#endif /* !CONFIG_SPL_BUILD */
-
 ENDPROC(_main)