X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fcrt0.S;h=2f4c14e96bffac92f02a531932783c8b888adff0;hb=e6ac28b60be2d670948332197862e314b7977177;hp=80548ebbf6d2aa686fd52186da5f837f8039c652;hpb=5ba534d247d418e09c5b4fe5fb7fa780aac08e49;p=u-boot

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index 80548ebbf6..2f4c14e96b 100644
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -83,8 +83,11 @@ ENTRY(_main)
 	bic	sp, sp, #7	/* 8-byte alignment for ABI compliance */
 #endif
 	mov	r0, sp
-	bl	board_init_f_mem
+	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
 	bl	board_init_f
@@ -133,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! */