arm: move C runtime setup code in crt0.S

Move all the C runtime setup code from every start.S in arch/arm into arch/arm/lib/crt0.S. This covers the code sequence from setting up the initial stack to calling into board_init_r(). Also, rewrite the C runtime setup and make functions board_init_*() and relocate_code() behave according to normal C semantics (no jumping across the C stack any more, etc). Some SPL targets had to be touched because they use start.S explicitly or for some reason; the relevant maintainers and custodians are cc:ed. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

arm: move C runtime setup code in crt0.S
Move all the C runtime setup code from every start.S in arch/arm into arch/arm/lib/crt0.S. This covers the code sequence from setting up the initial stack to calling into board_init_r(). Also, rewrite the C runtime setup and make functions board_init_*() and relocate_code() behave according to normal C semantics (no jumping across the C stack any more, etc). Some SPL targets had to be touched because they use start.S explicitly or for some reason; the relevant maintainers and custodians are cc:ed. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Albert ARIBAUD
1 parent 7528cf5f01
Showing 21 changed files with 326 additions and 678 deletions Side-by-side Diff
arch/arm/cpu/arm1136/start.S
arch/arm/cpu/arm1176/start.S
arch/arm/cpu/arm720t/start.S
arch/arm/cpu/arm920t/start.S
arch/arm/cpu/arm925t/start.S
arch/arm/cpu/arm926ejs/start.S
arch/arm/cpu/arm946es/start.S
arch/arm/cpu/arm_intcm/start.S
arch/arm/cpu/armv7/start.S
arch/arm/cpu/ixp/start.S
arch/arm/cpu/pxa/start.S
arch/arm/cpu/s3c44b0/start.S
arch/arm/cpu/sa1100/start.S
arch/arm/lib/Makefile
arch/arm/lib/board.c
arch/arm/lib/crt0.S
include/common.h
include/configs/socfpga_cyclone5.h
lib/asm-offsets.c
nand_spl/board/freescale/mx31pdk/Makefile
@@ -165,14 +165,8 @@
 	bl  cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
+	bl	_main
  
-	bl	board_init_f
-
 /*------------------------------------------------------------------------------*/
  
 /*
  
@@ -188,14 +182,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _image_copy_end_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
  
  
  
@@ -245,62 +235,29 @@
 	add	r2, r2, #8		/* each rel.dyn entry is 8 bytes */
 	cmp	r2, r3
 	blo	fixloop
-	b	clear_bss
+	bx	lr
  
+#endif
+
+relocate_done:
+
+	bx	lr
+
+#ifndef CONFIG_SPL_BUILD
+
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
-#endif
  
-clear_bss:
-#ifdef CONFIG_SPL_BUILD
-	/* No relocation for SPL */
-	ldr	r0, =__bss_start
-	ldr	r1, =__bss_end__
-#else
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
 #endif
-	mov	r2, #0x00000000		/* clear			    */
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
  
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     r0, _nand_boot_ofs
-	mov	pc, r0
-
-_nand_boot_ofs:
-	.word nand_boot
-#else
-jump_2_ram:
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
+	bx	lr
  
 /*
  *************************************************************************
@@ -224,12 +224,7 @@
 	 */
 	bl	lowlevel_init		/* go setup pll,mux,memory */
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -246,14 +241,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
@@ -343,50 +334,10 @@
 skip_hw_init:
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-#ifndef CONFIG_NAND_SPL
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-#endif
+	bx	lr
  
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     pc, _nand_boot
-
-_nand_boot: .word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add     lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
@@ -398,6 +349,11 @@
 _mmu_table_base:
 	.word mmu_table
 #endif
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 #ifndef CONFIG_NAND_SPL
 /*
@@ -147,12 +147,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -169,14 +164,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -228,49 +219,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
 	mov	pc, lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -182,12 +182,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -204,14 +199,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -263,57 +254,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     r0, _nand_boot_ofs
-	mov	pc, r0
-
-_nand_boot_ofs:
-	.word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
 	mov	pc, lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -176,12 +176,7 @@
 	bl  cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -198,14 +193,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -257,57 +248,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     r0, _nand_boot_ofs
-	mov	pc, r0
-
-_nand_boot_ofs:
-	.word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
 	mov	pc, lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -198,20 +198,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-#else
-#ifdef CONFIG_SPL_BUILD
-	ldr	sp, =(CONFIG_SPL_STACK)
-#else
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-#endif
-#endif
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -229,15 +216,11 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	sub	r9, r6, r0		/* r9 <- relocation offset */
 	cmp	r0, r6
-	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	moveq	r9, #0			/* no relocation. offset(r9) = 0 */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
  
@@ -289,64 +272,23 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifdef CONFIG_SPL_BUILD
-	/* No relocation for SPL */
-	ldr	r0, =__bss_start
-	ldr	r1, =__bss_end__
-#else
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-#endif
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
+	bx	lr
  
-#ifndef CONFIG_SPL_BUILD
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     r0, _nand_boot_ofs
-	mov	pc, r0
-
-_nand_boot_ofs:
-	.word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	ldr	r1, _TEXT_BASE
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
 #endif
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	bx	lr
  
 /*
  *************************************************************************
@@ -147,12 +147,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -169,14 +164,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -228,52 +219,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     pc, _nand_boot
-
-_nand_boot: .word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
 	mov	pc, lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -143,12 +143,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -165,14 +160,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -224,57 +215,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
+	bx	lr
  
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_NAND_SPL
-	ldr     r0, _nand_boot_ofs
-	mov	pc, r0
-
-_nand_boot_ofs:
-	.word nand_boot
-#else
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -155,12 +155,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -177,14 +172,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _image_copy_end_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
  
@@ -233,35 +224,23 @@
 	add	r2, r2, #8		/* each rel.dyn entry is 8 bytes */
 	cmp	r2, r3
 	blo	fixloop
-	b	clear_bss
+
+relocate_done:
+
+	bx	lr
+
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+ENDPROC(relocate_code)
  
-clear_bss:
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+#endif
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-
+ENTRY(c_runtime_cpu_setup)
 /*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-jump_2_ram:
-/*
  * If I-cache is enabled invalidate it
  */
 #ifndef CONFIG_SYS_ICACHE_OFF
  
@@ -279,20 +258,9 @@
 	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 #endif /* !Tegra20 */
  
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
+	bx	lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-ENDPROC(relocate_code)
-#endif
+ENDPROC(c_runtime_cpu_setup)
  
 /*************************************************************************
  *
@@ -245,12 +245,7 @@
 	orr	r0,r0,#0x13
 	msr	cpsr,r0
  
-/* Set initial stackpointer in SDRAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -267,14 +262,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -326,49 +317,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
+	bx	lr
  
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	bx	lr
  
 /****************************************************************************/
 /*									    */
@@ -164,12 +164,7 @@
 	bl	lock_cache_for_stack
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0, =0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
 #ifndef CONFIG_SPL_BUILD
@@ -186,10 +181,6 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 /* Disable the Dcache RAM lock for stack now */
 #ifdef	CONFIG_CPU_PXA25X
 	bl	cpu_init_crit
@@ -198,7 +189,7 @@
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
  
@@ -250,56 +241,24 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-#endif	/* #ifndef CONFIG_SPL_BUILD */
+	bx	lr
  
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-#ifdef CONFIG_ONENAND_SPL
-	ldr     r0, _onenand_boot_ofs
-	mov	pc, r0
-
-_onenand_boot_ofs:
-	.word onenand_boot
-#else
-jump_2_ram:
-	ldr	r0, _board_init_r_ofs
-	ldr     r1, _TEXT_BASE
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-#endif
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
 #endif
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	bx	lr
+
 /*
  *************************************************************************
  *
@@ -128,12 +128,7 @@
 	bl	lowlevel_init
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -150,14 +145,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -209,49 +200,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
+	bx	lr
  
-	bl coloured_LED_init
-	bl red_led_on
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
-	mov	pc, lr
-
-_board_init_r_ofs:
-	.word board_init_r - _start
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	bx	lr
  
 /*
  *************************************************************************
@@ -132,12 +132,7 @@
 	bl	cpu_init_crit
 #endif
  
-/* Set stackpointer in internal RAM to call board_init_f */
-call_board_init_f:
-	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
-	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
-	ldr	r0,=0x00000000
-	bl	board_init_f
+	bl	_main
  
 /*------------------------------------------------------------------------------*/
  
  
@@ -154,14 +149,10 @@
 	mov	r5, r1	/* save addr of gd */
 	mov	r6, r2	/* save addr of destination */
  
-	/* Set up the stack						    */
-stack_setup:
-	mov	sp, r4
-
 	adr	r0, _start
 	cmp	r0, r6
 	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
-	beq	clear_bss		/* skip relocation */
+	beq	relocate_done		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
 	add	r2, r0, r3		/* r2 <- source end address	    */
  
  
  
@@ -213,46 +204,21 @@
 	blo	fixloop
 #endif
  
-clear_bss:
-#ifndef CONFIG_SPL_BUILD
-	ldr	r0, _bss_start_ofs
-	ldr	r1, _bss_end_ofs
-	mov	r4, r6			/* reloc addr */
-	add	r0, r0, r4
-	add	r1, r1, r4
-	mov	r2, #0x00000000		/* clear			    */
+relocate_done:
  
-clbss_l:cmp	r0, r1			/* clear loop... */
-	bhs	clbss_e			/* if reached end of bss, exit */
-	str	r2, [r0]
-	add	r0, r0, #4
-	b	clbss_l
-clbss_e:
-#endif
-
-/*
- * We are done. Do not return, instead branch to second part of board
- * initialization, now running from RAM.
- */
-	ldr	r0, _board_init_r_ofs
-	adr	r1, _start
-	add	lr, r0, r1
-	add	lr, lr, r9
-	/* setup parameters for board_init_r */
-	mov	r0, r5		/* gd_t */
-	mov	r1, r6		/* dest_addr */
-	/* jump to it ... */
 	mov	pc, lr
  
-_board_init_r_ofs:
-	.word board_init_r - _start
-
 _rel_dyn_start_ofs:
 	.word __rel_dyn_start - _start
 _rel_dyn_end_ofs:
 	.word __rel_dyn_end - _start
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
+
+	.globl	c_runtime_cpu_setup
+c_runtime_cpu_setup:
+
+	mov	pc, lr
  
 /*
  *************************************************************************
@@ -36,6 +36,8 @@
  
 GLCOBJS	+= div0.o
  
+SOBJS-y += crt0.o
+
 ifndef CONFIG_SPL_BUILD
 COBJS-y	+= board.o
 COBJS-y	+= bootm.o
@@ -279,11 +279,6 @@
  
 	bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_F, "board_init_f");
  
-	/* Pointer is writable since we allocated a register for it */
-	gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR) & ~0x07);
-	/* compiler optimization barrier needed for GCC >= 3.4 */
-	__asm__ __volatile__("": : :"memory");
-
 	memset((void *)gd, 0, sizeof(gd_t));
  
 	gd->mon_len = _bss_end_ofs;
@@ -465,10 +460,6 @@
 		gd->fdt_blob = new_fdt;
 	}
 	memcpy(id, (void *)gd, sizeof(gd_t));
-
-	relocate_code(addr_sp, id, addr);
-
-	/* NOTREACHED - relocate_code() does not return */
 }
  
 #if !defined(CONFIG_SYS_NO_FLASH)
@@ -492,8 +483,6 @@
 #if !defined(CONFIG_SYS_NO_FLASH)
 	ulong flash_size;
 #endif
-
-	gd = id;
  
 	gd->flags |= GD_FLG_RELOC;	/* tell others: relocation done */
 	bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r");
+/*
+ *  crt0 - C-runtime startup Code for ARM U-Boot
+ *
+ *  Copyright (c) 2012  Albert ARIBAUD <albert.u.boot@aribaud.net>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <asm-offsets.h>
+
+/*
+ * This file handles the target-independent stages of the U-Boot
+ * start-up where a C runtime environment is needed. Its entry point
+ * is _main and is branched into from the target's start.S file.
+ *
+ * _main execution sequence is:
+ *
+ * 1. Set up initial environment for calling board_init_f().
+ *    This environment only provides a stack and a place to store
+ *    the GD ('global data') structure, both located in some readily
+ *    available RAM (SRAM, locked cache...). In this context, VARIABLE
+ *    global data, initialized or not (BSS), are UNAVAILABLE; only
+ *    CONSTANT initialized data are available.
+ *
+ * 2. Call board_init_f(). This function prepares the hardware for
+ *    execution from system RAM (DRAM, DDR...) As system RAM may not
+ *    be available yet, , board_init_f() must use the current GD to
+ *    store any data which must be passed on to later stages. These
+ *    data include the relocation destination, the future stack, and
+ *    the future GD location.
+ *
+ * (the following applies only to non-SPL builds)
+ *
+ * 3. Set up intermediate environment where the stack and GD are the
+ *    ones allocated by board_init_f() in system RAM, but BSS and
+ *    initialized non-const data are still not available.
+ *
+ * 4. Call relocate_code(). This function relocates U-Boot from its
+ *    current location into the relocation destination computed by
+ *    board_init_f().
+ *
+ * 5. Set up final environment for calling board_init_r(). This
+ *    environment has BSS (initialized to 0), initialized non-const
+ *    data (initialized to their intended value), and stack in system
+ *    RAM. GD has retained values set by board_init_f(). Some CPUs
+ *    have some work left to do at this point regarding memory, so
+ *    call c_runtime_cpu_setup.
+ *
+ * 6. Branch to either nand_boot() or board_init_r().
+ */
+
+/*
+ * declare nand_boot() or board_init_r() to jump to at end of crt0
+ */
+
+#if defined(CONFIG_NAND_SPL)
+
+.globl nand_boot
+
+#elif ! defined(CONFIG_SPL_BUILD)
+
+.globl board_init_r
+
+#endif
+
+/*
+ * start and end of BSS
+ */
+
+.globl __bss_start
+.globl __bss_end__
+
+/*
+ * entry point of crt0 sequence
+ */
+
+.global _main
+
+_main:
+
+/*
+ * Set up initial C runtime environment and call board_init_f(0).
+ */
+
+#if defined(CONFIG_NAND_SPL)
+	/* deprecated, use instead CONFIG_SPL_BUILD */
+	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
+	ldr	sp, =(CONFIG_SPL_STACK)
+#else
+	ldr	sp, =(CONFIG_SYS_INIT_SP_ADDR)
+#endif
+	bic	sp, sp, #7	/* 8-byte alignment for ABI compliance */
+	sub	sp, #GD_SIZE	/* allocate one GD above SP */
+	bic	sp, sp, #7	/* 8-byte alignment for ABI compliance */
+	mov	r8, sp		/* GD is above SP */
+	mov	r0, #0
+	bl	board_init_f
+
+#if ! defined(CONFIG_SPL_BUILD)
+
+/*
+ * Set up intermediate environment (new sp and gd) and call
+ * relocate_code(addr_sp, gd, addr_moni). Trick here is that
+ * we'll return 'here' but relocated.
+ */
+
+	ldr	sp, [r8, #GD_START_ADDR_SP]	/* r8 = gd->start_addr_sp */
+	bic	sp, sp, #7	/* 8-byte alignment for ABI compliance */
+	ldr	r8, [r8, #GD_BD]		/* r8 = gd->bd */
+	sub	r8, r8, #GD_SIZE		/* new GD is below bd */
+
+	adr	lr, here
+	ldr	r0, [r8, #GD_RELOC_OFF]		/* lr = gd->start_addr_sp */
+	add	lr, lr, r0
+	ldr	r0, [r8, #GD_START_ADDR_SP]	/* r0 = gd->start_addr_sp */
+	mov	r1, r8				/* r1 = gd */
+	ldr	r2, [r8, #GD_RELOCADDR]		/* r2 = gd->relocaddr */
+	b	relocate_code
+here:
+
+/* Set up final (full) environment */
+
+	bl	c_runtime_cpu_setup	/* we still call old routine here */
+
+	ldr	r0, =__bss_start	/* this is auto-relocated! */
+	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
+
+	bl coloured_LED_init
+	bl red_led_on
+
+#if defined(CONFIG_NAND_SPL)
+
+	/* call _nand_boot() */
+	ldr     pc, =nand_boot
+
+#else
+
+	/* call board_init_r(gd_t *id, ulong dest_addr) */
+	mov	r0, r8			/* gd_t */
+	ldr	r1, [r8, #GD_RELOCADDR]	/* dest_addr */
+	/* call board_init_r */
+	ldr	pc, =board_init_r	/* this is auto-relocated! */
+
+#endif
+
+	/* we should not return here. */
+
+#endif
@@ -300,7 +300,7 @@
 extern char console_buffer[];
  
 /* arch/$(ARCH)/lib/board.c */
-void	board_init_f  (ulong) __attribute__ ((noreturn));
+void	board_init_f(ulong);
 void	board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int	checkboard    (void);
 int	checkflash    (void);
@@ -65,7 +65,7 @@
 #define CONFIG_SYS_BOOTMAPSZ		((256*1024*1024) - (4*1024))
  
 #define CONFIG_SPL_RAM_DEVICE
-#define CONFIG_SPL_STACK (&__stack_start)
+#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SYS_SPL_MALLOC_START ((unsigned long) (&__malloc_start))
 #define CONFIG_SYS_SPL_MALLOC_SIZE (&__malloc_end - &__malloc_start)
  
@@ -28,6 +28,20 @@
 	DEFINE(GENERATED_BD_INFO_SIZE,
 		(sizeof(struct bd_info) + 15) & ~15);
  
+	DEFINE(GD_SIZE, sizeof(struct global_data));
+
+	DEFINE(GD_BD, offsetof(struct global_data, bd));
+
+#if defined(CONFIG_ARM)
+
+	DEFINE(GD_RELOCADDR, offsetof(struct global_data, relocaddr));
+
+	DEFINE(GD_RELOC_OFF, offsetof(struct global_data, reloc_off));
+
+	DEFINE(GD_START_ADDR_SP, offsetof(struct global_data, start_addr_sp));
+
+#endif
+
 	return 0;
 }
@@ -12,11 +12,12 @@
 AFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
  
-SOBJS	= start.o lowlevel_init.o
+SOBJS	= start.o crt0.o lowlevel_init.o
 COBJS	= nand_boot_fsl_nfc.o
  
 SRCS	:= $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c
 SRCS	+= $(SRCTREE)/arch/arm/cpu/arm1136/start.S
+SRCS	+= $(SRCTREE)/arch/arm/lib/crt0.S
 SRCS	+= $(SRCTREE)/board/freescale/mx31pdk/lowlevel_init.S
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
@@ -48,6 +49,9 @@
 #########################################################################
  
 $(obj)%.o:	$(SRCTREE)/arch/arm/cpu/arm1136/%.S
+	$(CC) $(AFLAGS) -c -o $@ $<
+
+$(obj)%.o:	$(SRCTREE)/arch/arm/lib/%.S
 	$(CC) $(AFLAGS) -c -o $@ $<
  
 $(obj)%.o:	$(SRCTREE)/board/freescale/mx31pdk/%.S
@@ -33,11 +33,12 @@
 AFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
  
-SOBJS	= start.o lowlevel_init.o
+SOBJS	= start.o crt0.o lowlevel_init.o
 COBJS	= nand_boot_fsl_nfc.o
  
 SRCS	:= $(SRCTREE)/nand_spl/nand_boot_fsl_nfc.c
 SRCS	+= $(SRCTREE)/arch/arm/cpu/arm926ejs/start.S
+SRCS	+= $(SRCTREE)/arch/arm/lib/crt0.S
 SRCS	+= $(SRCTREE)/board/karo/tx25/lowlevel_init.S
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
@@ -69,6 +70,9 @@
 #########################################################################
  
 $(obj)%.o:	$(SRCTREE)/arch/arm/cpu/arm926ejs/%.S
+	$(CC) $(AFLAGS) -c -o $@ $<
+
+$(obj)%.o:	$(SRCTREE)/arch/arm/lib/%.S
 	$(CC) $(AFLAGS) -c -o $@ $<
  
 $(obj)%.o:	$(SRCTREE)/board/karo/tx25/%.S
...	...	@@ -165,14 +165,8 @@
165	165	bl cpu_init_crit
166	166	#endif
167	167
168		-/* Set stackpointer in internal RAM to call board_init_f */
169		-call_board_init_f:
170		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
171		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
172		- ldr r0,=0x00000000
	168	+ bl _main
173	169
174		- bl board_init_f
175		-
176	170	/------------------------------------------------------------------------------/
177	171
178	172	/*
179	173
...	...	@@ -188,14 +182,10 @@
188	182	mov r5, r1 /* save addr of gd */
189	183	mov r6, r2 /* save addr of destination */
190	184
191		- /* Set up the stack */
192		-stack_setup:
193		- mov sp, r4
194		-
195	185	adr r0, _start
196	186	cmp r0, r6
197	187	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
198		- beq clear_bss /* skip relocation */
	188	+ beq relocate_done /* skip relocation */
199	189	mov r1, r6 /* r1 <- scratch for copy_loop */
200	190	ldr r3, _image_copy_end_ofs
201	191	add r2, r0, r3 /* r2 <- source end address */
202	192
203	193
204	194
205	195
206	196
207	197
...	...	@@ -245,62 +235,29 @@
245	235	add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
246	236	cmp r2, r3
247	237	blo fixloop
248		- b clear_bss
	238	+ bx lr
249	239
	240	+#endif
	241	+
	242	+relocate_done:
	243	+
	244	+ bx lr
	245	+
	246	+#ifndef CONFIG_SPL_BUILD
	247	+
250	248	_rel_dyn_start_ofs:
251	249	.word __rel_dyn_start - _start
252	250	_rel_dyn_end_ofs:
253	251	.word __rel_dyn_end - _start
254	252	_dynsym_start_ofs:
255	253	.word __dynsym_start - _start
256		-#endif
257	254
258		-clear_bss:
259		-#ifdef CONFIG_SPL_BUILD
260		- /* No relocation for SPL */
261		- ldr r0, =__bss_start
262		- ldr r1, =__bss_end__
263		-#else
264		- ldr r0, _bss_start_ofs
265		- ldr r1, _bss_end_ofs
266		- mov r4, r6 /* reloc addr */
267		- add r0, r0, r4
268		- add r1, r1, r4
269	255	#endif
270		- mov r2, #0x00000000 /* clear */
271	256
272		-clbss_l:cmp r0, r1 /* clear loop... */
273		- bhs clbss_e /* if reached end of bss, exit */
274		- str r2, [r0]
275		- add r0, r0, #4
276		- b clbss_l
277		-clbss_e:
	257	+ .globl c_runtime_cpu_setup
	258	+c_runtime_cpu_setup:
278	259
279		-/*
280		- * We are done. Do not return, instead branch to second part of board
281		- * initialization, now running from RAM.
282		- */
283		-#ifdef CONFIG_NAND_SPL
284		- ldr r0, _nand_boot_ofs
285		- mov pc, r0
286		-
287		-_nand_boot_ofs:
288		- .word nand_boot
289		-#else
290		-jump_2_ram:
291		- ldr r0, _board_init_r_ofs
292		- adr r1, _start
293		- add lr, r0, r1
294		- add lr, lr, r9
295		- /* setup parameters for board_init_r */
296		- mov r0, r5 /* gd_t */
297		- mov r1, r6 /* dest_addr */
298		- /* jump to it ... */
299		- mov pc, lr
300		-
301		-_board_init_r_ofs:
302		- .word board_init_r - _start
303		-#endif
	260	+ bx lr
304	261
305	262	/*
306	263	*************************************************************************
...	...	@@ -224,12 +224,7 @@
224	224	*/
225	225	bl lowlevel_init /* go setup pll,mux,memory */
226	226
227		-/* Set stackpointer in internal RAM to call board_init_f */
228		-call_board_init_f:
229		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
230		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
231		- ldr r0,=0x00000000
232		- bl board_init_f
	227	+ bl _main
233	228
234	229	/------------------------------------------------------------------------------/
235	230
236	231
...	...	@@ -246,14 +241,10 @@
246	241	mov r5, r1 /* save addr of gd */
247	242	mov r6, r2 /* save addr of destination */
248	243
249		- /* Set up the stack */
250		-stack_setup:
251		- mov sp, r4
252		-
253	244	adr r0, _start
254	245	cmp r0, r6
255	246	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
256		- beq clear_bss /* skip relocation */
	247	+ beq relocate_done /* skip relocation */
257	248	mov r1, r6 /* r1 <- scratch for copy_loop */
258	249	ldr r3, _bss_start_ofs
259	250	add r2, r0, r3 /* r2 <- source end address */
260	251
261	252
...	...	@@ -343,50 +334,10 @@
343	334	skip_hw_init:
344	335	#endif
345	336
346		-clear_bss:
347		-#ifndef CONFIG_SPL_BUILD
348		- ldr r0, _bss_start_ofs
349		- ldr r1, _bss_end_ofs
350		- mov r4, r6 /* reloc addr */
351		- add r0, r0, r4
352		- add r1, r1, r4
353		- mov r2, #0x00000000 /* clear */
	337	+relocate_done:
354	338
355		-clbss_l:cmp r0, r1 /* clear loop... */
356		- bhs clbss_e /* if reached end of bss, exit */
357		- str r2, [r0]
358		- add r0, r0, #4
359		- b clbss_l
360		-clbss_e:
361		-#ifndef CONFIG_NAND_SPL
362		- bl coloured_LED_init
363		- bl red_led_on
364		-#endif
365		-#endif
	339	+ bx lr
366	340
367		-/*
368		- * We are done. Do not return, instead branch to second part of board
369		- * initialization, now running from RAM.
370		- */
371		-#ifdef CONFIG_NAND_SPL
372		- ldr pc, _nand_boot
373		-
374		-_nand_boot: .word nand_boot
375		-#else
376		- ldr r0, _board_init_r_ofs
377		- adr r1, _start
378		- add lr, r0, r1
379		- add lr, lr, r9
380		- /* setup parameters for board_init_r */
381		- mov r0, r5 /* gd_t */
382		- mov r1, r6 /* dest_addr */
383		- /* jump to it ... */
384		- mov pc, lr
385		-
386		-_board_init_r_ofs:
387		- .word board_init_r - _start
388		-#endif
389		-
390	341	_rel_dyn_start_ofs:
391	342	.word __rel_dyn_start - _start
392	343	_rel_dyn_end_ofs:
...	...	@@ -398,6 +349,11 @@
398	349	_mmu_table_base:
399	350	.word mmu_table
400	351	#endif
	352	+
	353	+ .globl c_runtime_cpu_setup
	354	+c_runtime_cpu_setup:
	355	+
	356	+ mov pc, lr
401	357
402	358	#ifndef CONFIG_NAND_SPL
403	359	/*
...	...	@@ -147,12 +147,7 @@
147	147	bl cpu_init_crit
148	148	#endif
149	149
150		-/* Set stackpointer in internal RAM to call board_init_f */
151		-call_board_init_f:
152		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
153		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
154		- ldr r0,=0x00000000
155		- bl board_init_f
	150	+ bl _main
156	151
157	152	/------------------------------------------------------------------------------/
158	153
159	154
...	...	@@ -169,14 +164,10 @@
169	164	mov r5, r1 /* save addr of gd */
170	165	mov r6, r2 /* save addr of destination */
171	166
172		- /* Set up the stack */
173		-stack_setup:
174		- mov sp, r4
175		-
176	167	adr r0, _start
177	168	cmp r0, r6
178	169	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
179		- beq clear_bss /* skip relocation */
	170	+ beq relocate_done /* skip relocation */
180	171	mov r1, r6 /* r1 <- scratch for copy_loop */
181	172	ldr r3, _bss_start_ofs
182	173	add r2, r0, r3 /* r2 <- source end address */
183	174
184	175
185	176
...	...	@@ -228,49 +219,21 @@
228	219	blo fixloop
229	220	#endif
230	221
231		-clear_bss:
232		-#ifndef CONFIG_SPL_BUILD
233		- ldr r0, _bss_start_ofs
234		- ldr r1, _bss_end_ofs
235		- mov r4, r6 /* reloc addr */
236		- add r0, r0, r4
237		- add r1, r1, r4
238		- mov r2, #0x00000000 /* clear */
	222	+relocate_done:
239	223
240		-clbss_l:cmp r0, r1 /* clear loop... */
241		- bhs clbss_e /* if reached end of bss, exit */
242		- str r2, [r0]
243		- add r0, r0, #4
244		- b clbss_l
245		-clbss_e:
246		-
247		- bl coloured_LED_init
248		- bl red_led_on
249		-#endif
250		-
251		-/*
252		- * We are done. Do not return, instead branch to second part of board
253		- * initialization, now running from RAM.
254		- */
255		- ldr r0, _board_init_r_ofs
256		- adr r1, _start
257		- add lr, r0, r1
258		- add lr, lr, r9
259		- /* setup parameters for board_init_r */
260		- mov r0, r5 /* gd_t */
261		- mov r1, r6 /* dest_addr */
262		- /* jump to it ... */
263	224	mov pc, lr
264	225
265		-_board_init_r_ofs:
266		- .word board_init_r - _start
267		-
268	226	_rel_dyn_start_ofs:
269	227	.word __rel_dyn_start - _start
270	228	_rel_dyn_end_ofs:
271	229	.word __rel_dyn_end - _start
272	230	_dynsym_start_ofs:
273	231	.word __dynsym_start - _start
	232	+
	233	+ .globl c_runtime_cpu_setup
	234	+c_runtime_cpu_setup:
	235	+
	236	+ mov pc, lr
274	237
275	238	/*
276	239	*************************************************************************
...	...	@@ -182,12 +182,7 @@
182	182	bl cpu_init_crit
183	183	#endif
184	184
185		-/* Set stackpointer in internal RAM to call board_init_f */
186		-call_board_init_f:
187		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
188		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
189		- ldr r0,=0x00000000
190		- bl board_init_f
	185	+ bl _main
191	186
192	187	/------------------------------------------------------------------------------/
193	188
194	189
...	...	@@ -204,14 +199,10 @@
204	199	mov r5, r1 /* save addr of gd */
205	200	mov r6, r2 /* save addr of destination */
206	201
207		- /* Set up the stack */
208		-stack_setup:
209		- mov sp, r4
210		-
211	202	adr r0, _start
212	203	cmp r0, r6
213	204	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
214		- beq clear_bss /* skip relocation */
	205	+ beq relocate_done /* skip relocation */
215	206	mov r1, r6 /* r1 <- scratch for copy_loop */
216	207	ldr r3, _bss_start_ofs
217	208	add r2, r0, r3 /* r2 <- source end address */
218	209
219	210
220	211
...	...	@@ -263,57 +254,21 @@
263	254	blo fixloop
264	255	#endif
265	256
266		-clear_bss:
267		-#ifndef CONFIG_SPL_BUILD
268		- ldr r0, _bss_start_ofs
269		- ldr r1, _bss_end_ofs
270		- mov r4, r6 /* reloc addr */
271		- add r0, r0, r4
272		- add r1, r1, r4
273		- mov r2, #0x00000000 /* clear */
	257	+relocate_done:
274	258
275		-clbss_l:cmp r0, r1 /* clear loop... */
276		- bhs clbss_e /* if reached end of bss, exit */
277		- str r2, [r0]
278		- add r0, r0, #4
279		- b clbss_l
280		-clbss_e:
281		-
282		- bl coloured_LED_init
283		- bl red_led_on
284		-#endif
285		-
286		-/*
287		- * We are done. Do not return, instead branch to second part of board
288		- * initialization, now running from RAM.
289		- */
290		-#ifdef CONFIG_NAND_SPL
291		- ldr r0, _nand_boot_ofs
292		- mov pc, r0
293		-
294		-_nand_boot_ofs:
295		- .word nand_boot
296		-#else
297		- ldr r0, _board_init_r_ofs
298		- adr r1, _start
299		- add lr, r0, r1
300		- add lr, lr, r9
301		- /* setup parameters for board_init_r */
302		- mov r0, r5 /* gd_t */
303		- mov r1, r6 /* dest_addr */
304		- /* jump to it ... */
305	259	mov pc, lr
306	260
307		-_board_init_r_ofs:
308		- .word board_init_r - _start
309		-#endif
310		-
311	261	_rel_dyn_start_ofs:
312	262	.word __rel_dyn_start - _start
313	263	_rel_dyn_end_ofs:
314	264	.word __rel_dyn_end - _start
315	265	_dynsym_start_ofs:
316	266	.word __dynsym_start - _start
	267	+
	268	+ .globl c_runtime_cpu_setup
	269	+c_runtime_cpu_setup:
	270	+
	271	+ mov pc, lr
317	272
318	273	/*
319	274	*************************************************************************
...	...	@@ -176,12 +176,7 @@
176	176	bl cpu_init_crit
177	177	#endif
178	178
179		-/* Set stackpointer in internal RAM to call board_init_f */
180		-call_board_init_f:
181		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
182		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
183		- ldr r0,=0x00000000
184		- bl board_init_f
	179	+ bl _main
185	180
186	181	/------------------------------------------------------------------------------/
187	182
188	183
...	...	@@ -198,14 +193,10 @@
198	193	mov r5, r1 /* save addr of gd */
199	194	mov r6, r2 /* save addr of destination */
200	195
201		- /* Set up the stack */
202		-stack_setup:
203		- mov sp, r4
204		-
205	196	adr r0, _start
206	197	cmp r0, r6
207	198	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
208		- beq clear_bss /* skip relocation */
	199	+ beq relocate_done /* skip relocation */
209	200	mov r1, r6 /* r1 <- scratch for copy_loop */
210	201	ldr r3, _bss_start_ofs
211	202	add r2, r0, r3 /* r2 <- source end address */
212	203
213	204
214	205
...	...	@@ -257,57 +248,21 @@
257	248	blo fixloop
258	249	#endif
259	250
260		-clear_bss:
261		-#ifndef CONFIG_SPL_BUILD
262		- ldr r0, _bss_start_ofs
263		- ldr r1, _bss_end_ofs
264		- mov r4, r6 /* reloc addr */
265		- add r0, r0, r4
266		- add r1, r1, r4
267		- mov r2, #0x00000000 /* clear */
	251	+relocate_done:
268	252
269		-clbss_l:cmp r0, r1 /* clear loop... */
270		- bhs clbss_e /* if reached end of bss, exit */
271		- str r2, [r0]
272		- add r0, r0, #4
273		- b clbss_l
274		-clbss_e:
275		-
276		- bl coloured_LED_init
277		- bl red_led_on
278		-#endif
279		-
280		-/*
281		- * We are done. Do not return, instead branch to second part of board
282		- * initialization, now running from RAM.
283		- */
284		-#ifdef CONFIG_NAND_SPL
285		- ldr r0, _nand_boot_ofs
286		- mov pc, r0
287		-
288		-_nand_boot_ofs:
289		- .word nand_boot
290		-#else
291		- ldr r0, _board_init_r_ofs
292		- adr r1, _start
293		- add lr, r0, r1
294		- add lr, lr, r9
295		- /* setup parameters for board_init_r */
296		- mov r0, r5 /* gd_t */
297		- mov r1, r6 /* dest_addr */
298		- /* jump to it ... */
299	253	mov pc, lr
300	254
301		-_board_init_r_ofs:
302		- .word board_init_r - _start
303		-#endif
304		-
305	255	_rel_dyn_start_ofs:
306	256	.word __rel_dyn_start - _start
307	257	_rel_dyn_end_ofs:
308	258	.word __rel_dyn_end - _start
309	259	_dynsym_start_ofs:
310	260	.word __dynsym_start - _start
	261	+
	262	+ .globl c_runtime_cpu_setup
	263	+c_runtime_cpu_setup:
	264	+
	265	+ mov pc, lr
311	266
312	267	/*
313	268	*************************************************************************
...	...	@@ -198,20 +198,7 @@
198	198	bl cpu_init_crit
199	199	#endif
200	200
201		-/* Set stackpointer in internal RAM to call board_init_f */
202		-call_board_init_f:
203		-#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */
204		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
205		-#else
206		-#ifdef CONFIG_SPL_BUILD
207		- ldr sp, =(CONFIG_SPL_STACK)
208		-#else
209		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
210		-#endif
211		-#endif
212		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
213		- ldr r0,=0x00000000
214		- bl board_init_f
	201	+ bl _main
215	202
216	203	/------------------------------------------------------------------------------/
217	204
218	205
...	...	@@ -229,15 +216,11 @@
229	216	mov r5, r1 /* save addr of gd */
230	217	mov r6, r2 /* save addr of destination */
231	218
232		- /* Set up the stack */
233		-stack_setup:
234		- mov sp, r4
235		-
236	219	adr r0, _start
237	220	sub r9, r6, r0 /* r9 <- relocation offset */
238	221	cmp r0, r6
239		- moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
240		- beq clear_bss /* skip relocation */
	222	+ moveq r9, #0 /* no relocation. offset(r9) = 0 */
	223	+ beq relocate_done /* skip relocation */
241	224	mov r1, r6 /* r1 <- scratch for copy loop */
242	225	ldr r3, _bss_start_ofs
243	226	add r2, r0, r3 /* r2 <- source end address */
244	227
245	228
246	229
247	230
...	...	@@ -289,64 +272,23 @@
289	272	blo fixloop
290	273	#endif
291	274
292		-clear_bss:
293		-#ifdef CONFIG_SPL_BUILD
294		- /* No relocation for SPL */
295		- ldr r0, =__bss_start
296		- ldr r1, =__bss_end__
297		-#else
298		- ldr r0, _bss_start_ofs
299		- ldr r1, _bss_end_ofs
300		- mov r4, r6 /* reloc addr */
301		- add r0, r0, r4
302		- add r1, r1, r4
303		-#endif
304		- mov r2, #0x00000000 /* clear */
	275	+relocate_done:
305	276
306		-clbss_l:cmp r0, r1 /* clear loop... */
307		- bhs clbss_e /* if reached end of bss, exit */
308		- str r2, [r0]
309		- add r0, r0, #4
310		- b clbss_l
311		-clbss_e:
	277	+ bx lr
312	278
313		-#ifndef CONFIG_SPL_BUILD
314		- bl coloured_LED_init
315		- bl red_led_on
316		-#endif
317		-
318		-/*
319		- * We are done. Do not return, instead branch to second part of board
320		- * initialization, now running from RAM.
321		- */
322		-#ifdef CONFIG_NAND_SPL
323		- ldr r0, _nand_boot_ofs
324		- mov pc, r0
325		-
326		-_nand_boot_ofs:
327		- .word nand_boot
328		-#else
329		- ldr r0, _board_init_r_ofs
330		- ldr r1, _TEXT_BASE
331		- add lr, r0, r1
332		- add lr, lr, r9
333		- /* setup parameters for board_init_r */
334		- mov r0, r5 /* gd_t */
335		- mov r1, r6 /* dest_addr */
336		- /* jump to it ... */
337		- mov pc, lr
338		-
339		-_board_init_r_ofs:
340		- .word board_init_r - _start
341		-#endif
342		-
343	279	_rel_dyn_start_ofs:
344	280	.word __rel_dyn_start - _start
345	281	_rel_dyn_end_ofs:
346	282	.word __rel_dyn_end - _start
347	283	_dynsym_start_ofs:
348	284	.word __dynsym_start - _start
	285	+
349	286	#endif
	287	+
	288	+ .globl c_runtime_cpu_setup
	289	+c_runtime_cpu_setup:
	290	+
	291	+ bx lr
350	292
351	293	/*
352	294	*************************************************************************
...	...	@@ -143,12 +143,7 @@
143	143	bl cpu_init_crit
144	144	#endif
145	145
146		-/* Set stackpointer in internal RAM to call board_init_f */
147		-call_board_init_f:
148		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
149		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
150		- ldr r0,=0x00000000
151		- bl board_init_f
	146	+ bl _main
152	147
153	148	/------------------------------------------------------------------------------/
154	149
155	150
...	...	@@ -165,14 +160,10 @@
165	160	mov r5, r1 /* save addr of gd */
166	161	mov r6, r2 /* save addr of destination */
167	162
168		- /* Set up the stack */
169		-stack_setup:
170		- mov sp, r4
171		-
172	163	adr r0, _start
173	164	cmp r0, r6
174	165	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
175		- beq clear_bss /* skip relocation */
	166	+ beq relocate_done /* skip relocation */
176	167	mov r1, r6 /* r1 <- scratch for copy_loop */
177	168	ldr r3, _bss_start_ofs
178	169	add r2, r0, r3 /* r2 <- source end address */
179	170
180	171
181	172
...	...	@@ -224,57 +215,21 @@
224	215	blo fixloop
225	216	#endif
226	217
227		-clear_bss:
228		-#ifndef CONFIG_SPL_BUILD
229		- ldr r0, _bss_start_ofs
230		- ldr r1, _bss_end_ofs
231		- mov r4, r6 /* reloc addr */
232		- add r0, r0, r4
233		- add r1, r1, r4
234		- mov r2, #0x00000000 /* clear */
	218	+relocate_done:
235	219
236		-clbss_l:cmp r0, r1 /* clear loop... */
237		- bhs clbss_e /* if reached end of bss, exit */
238		- str r2, [r0]
239		- add r0, r0, #4
240		- b clbss_l
241		-clbss_e:
	220	+ bx lr
242	221
243		- bl coloured_LED_init
244		- bl red_led_on
245		-#endif
246		-
247		-/*
248		- * We are done. Do not return, instead branch to second part of board
249		- * initialization, now running from RAM.
250		- */
251		-#ifdef CONFIG_NAND_SPL
252		- ldr r0, _nand_boot_ofs
253		- mov pc, r0
254		-
255		-_nand_boot_ofs:
256		- .word nand_boot
257		-#else
258		- ldr r0, _board_init_r_ofs
259		- adr r1, _start
260		- add lr, r0, r1
261		- add lr, lr, r9
262		- /* setup parameters for board_init_r */
263		- mov r0, r5 /* gd_t */
264		- mov r1, r6 /* dest_addr */
265		- /* jump to it ... */
266		- mov pc, lr
267		-
268		-_board_init_r_ofs:
269		- .word board_init_r - _start
270		-#endif
271		-
272	222	_rel_dyn_start_ofs:
273	223	.word __rel_dyn_start - _start
274	224	_rel_dyn_end_ofs:
275	225	.word __rel_dyn_end - _start
276	226	_dynsym_start_ofs:
277	227	.word __dynsym_start - _start
	228	+
	229	+ .globl c_runtime_cpu_setup
	230	+c_runtime_cpu_setup:
	231	+
	232	+ mov pc, lr
278	233
279	234	/*
280	235	*************************************************************************
...	...	@@ -155,12 +155,7 @@
155	155	bl cpu_init_crit
156	156	#endif
157	157
158		-/* Set stackpointer in internal RAM to call board_init_f */
159		-call_board_init_f:
160		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
161		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
162		- ldr r0,=0x00000000
163		- bl board_init_f
	158	+ bl _main
164	159
165	160	/------------------------------------------------------------------------------/
166	161
167	162
...	...	@@ -177,14 +172,10 @@
177	172	mov r5, r1 /* save addr of gd */
178	173	mov r6, r2 /* save addr of destination */
179	174
180		- /* Set up the stack */
181		-stack_setup:
182		- mov sp, r4
183		-
184	175	adr r0, _start
185	176	cmp r0, r6
186	177	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
187		- beq clear_bss /* skip relocation */
	178	+ beq relocate_done /* skip relocation */
188	179	mov r1, r6 /* r1 <- scratch for copy_loop */
189	180	ldr r3, _image_copy_end_ofs
190	181	add r2, r0, r3 /* r2 <- source end address */
191	182
192	183
193	184
194	185
...	...	@@ -233,35 +224,23 @@
233	224	add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
234	225	cmp r2, r3
235	226	blo fixloop
236		- b clear_bss
	227	+
	228	+relocate_done:
	229	+
	230	+ bx lr
	231	+
237	232	_rel_dyn_start_ofs:
238	233	.word __rel_dyn_start - _start
239	234	_rel_dyn_end_ofs:
240	235	.word __rel_dyn_end - _start
241	236	_dynsym_start_ofs:
242	237	.word __dynsym_start - _start
	238	+ENDPROC(relocate_code)
243	239
244		-clear_bss:
245		- ldr r0, _bss_start_ofs
246		- ldr r1, _bss_end_ofs
247		- mov r4, r6 /* reloc addr */
248		- add r0, r0, r4
249		- add r1, r1, r4
250		- mov r2, #0x00000000 /* clear */
	240	+#endif
251	241
252		-clbss_l:cmp r0, r1 /* clear loop... */
253		- bhs clbss_e /* if reached end of bss, exit */
254		- str r2, [r0]
255		- add r0, r0, #4
256		- b clbss_l
257		-clbss_e:
258		-
	242	+ENTRY(c_runtime_cpu_setup)
259	243	/*
260		- * We are done. Do not return, instead branch to second part of board
261		- * initialization, now running from RAM.
262		- */
263		-jump_2_ram:
264		-/*
265	244	* If I-cache is enabled invalidate it
266	245	*/
267	246	#ifndef CONFIG_SYS_ICACHE_OFF
268	247
...	...	@@ -279,20 +258,9 @@
279	258	mcr p15, 0, r0, c12, c0, 0 @Set VBAR
280	259	#endif /* !Tegra20 */
281	260
282		- ldr r0, _board_init_r_ofs
283		- adr r1, _start
284		- add lr, r0, r1
285		- add lr, lr, r9
286		- /* setup parameters for board_init_r */
287		- mov r0, r5 /* gd_t */
288		- mov r1, r6 /* dest_addr */
289		- /* jump to it ... */
290		- mov pc, lr
	261	+ bx lr
291	262
292		-_board_init_r_ofs:
293		- .word board_init_r - _start
294		-ENDPROC(relocate_code)
295		-#endif
	263	+ENDPROC(c_runtime_cpu_setup)
296	264
297	265	/*************************************************************************
298	266	*
...	...	@@ -245,12 +245,7 @@
245	245	orr r0,r0,#0x13
246	246	msr cpsr,r0
247	247
248		-/* Set initial stackpointer in SDRAM to call board_init_f */
249		-call_board_init_f:
250		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
251		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
252		- ldr r0,=0x00000000
253		- bl board_init_f
	248	+ bl _main
254	249
255	250	/------------------------------------------------------------------------------/
256	251
257	252
...	...	@@ -267,14 +262,10 @@
267	262	mov r5, r1 /* save addr of gd */
268	263	mov r6, r2 /* save addr of destination */
269	264
270		- /* Set up the stack */
271		-stack_setup:
272		- mov sp, r4
273		-
274	265	adr r0, _start
275	266	cmp r0, r6
276	267	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
277		- beq clear_bss /* skip relocation */
	268	+ beq relocate_done /* skip relocation */
278	269	mov r1, r6 /* r1 <- scratch for copy_loop */
279	270	ldr r3, _bss_start_ofs
280	271	add r2, r0, r3 /* r2 <- source end address */
281	272
282	273
283	274
...	...	@@ -326,49 +317,21 @@
326	317	blo fixloop
327	318	#endif
328	319
329		-clear_bss:
330		-#ifndef CONFIG_SPL_BUILD
331		- ldr r0, _bss_start_ofs
332		- ldr r1, _bss_end_ofs
333		- mov r4, r6 /* reloc addr */
334		- add r0, r0, r4
335		- add r1, r1, r4
336		- mov r2, #0x00000000 /* clear */
	320	+relocate_done:
337	321
338		-clbss_l:cmp r0, r1 /* clear loop... */
339		- bhs clbss_e /* if reached end of bss, exit */
340		- str r2, [r0]
341		- add r0, r0, #4
342		- b clbss_l
343		-clbss_e:
	322	+ bx lr
344	323
345		- bl coloured_LED_init
346		- bl red_led_on
347		-#endif
348		-
349		-/*
350		- * We are done. Do not return, instead branch to second part of board
351		- * initialization, now running from RAM.
352		- */
353		- ldr r0, _board_init_r_ofs
354		- adr r1, _start
355		- add lr, r0, r1
356		- add lr, lr, r9
357		- /* setup parameters for board_init_r */
358		- mov r0, r5 /* gd_t */
359		- mov r1, r6 /* dest_addr */
360		- /* jump to it ... */
361		- mov pc, lr
362		-
363		-_board_init_r_ofs:
364		- .word board_init_r - _start
365		-
366	324	_rel_dyn_start_ofs:
367	325	.word __rel_dyn_start - _start
368	326	_rel_dyn_end_ofs:
369	327	.word __rel_dyn_end - _start
370	328	_dynsym_start_ofs:
371	329	.word __dynsym_start - _start
	330	+
	331	+ .globl c_runtime_cpu_setup
	332	+c_runtime_cpu_setup:
	333	+
	334	+ bx lr
372	335
373	336	/****************************************************************************/
374	337	/* */
...	...	@@ -164,12 +164,7 @@
164	164	bl lock_cache_for_stack
165	165	#endif
166	166
167		-/* Set stackpointer in internal RAM to call board_init_f */
168		-call_board_init_f:
169		- ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
170		- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
171		- ldr r0, =0x00000000
172		- bl board_init_f
	167	+ bl _main
173	168
174	169	/------------------------------------------------------------------------------/
175	170	#ifndef CONFIG_SPL_BUILD
...	...	@@ -186,10 +181,6 @@
186	181	mov r5, r1 /* save addr of gd */
187	182	mov r6, r2 /* save addr of destination */
188	183
189		- /* Set up the stack */
190		-stack_setup:
191		- mov sp, r4
192		-
193	184	/* Disable the Dcache RAM lock for stack now */
194	185	#ifdef CONFIG_CPU_PXA25X
195	186	bl cpu_init_crit
...	...	@@ -198,7 +189,7 @@
198	189	adr r0, _start
199	190	cmp r0, r6
200	191	moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
201		- beq clear_bss /* skip relocation */
	192	+ beq relocate_done /* skip relocation */
202	193	mov r1, r6 /* r1 <- scratch for copy_loop */
203	194	ldr r3, _bss_start_ofs
204	195	add r2, r0, r3 /* r2 <- source end address */
205	196
206	197
207	198
208	199
...	...	@@ -250,56 +241,24 @@
250	241	blo fixloop
251	242	#endif
252	243
253		-clear_bss:
254		-#ifndef CONFIG_SPL_BUILD
255		- ldr r0, _bss_start_ofs
256		- ldr r1, _bss_end_ofs
257		- mov r4, r6 /* reloc addr */
258		- add r0, r0, r4
259		- add r1, r1, r4
260		- mov r2, #0x00000000 /* clear */
	244	+relocate_done:
261	245
262		-clbss_l:cmp r0, r1 /* clear loop... */
263		- bhs clbss_e /* if reached end of bss, exit */
264		- str r2, [r0]
265		- add r0, r0, #4
266		- b clbss_l
267		-clbss_e:
268		-#endif /* #ifndef CONFIG_SPL_BUILD */
	246	+ bx lr
269	247
270		-/*
271		- * We are done. Do not return, instead branch to second part of board
272		- * initialization, now running from RAM.
273		- */
274		-#ifdef CONFIG_ONENAND_SPL
275		- ldr r0, _onenand_boot_ofs
276		- mov pc, r0
277		-
278		-_onenand_boot_ofs:
279		- .word onenand_boot
280		-#else
281		-jump_2_ram:
282		- ldr r0, _board_init_r_ofs
283		- ldr r1, _TEXT_BASE
284		- add lr, r0, r1
285		- add lr, lr, r9
286		- /* setup parameters for board_init_r */
287		- mov r0, r5 /* gd_t */
288		- mov r1, r6 /* dest_addr */
289		- /* jump to it ... */
290		- mov pc, lr
291		-
292		-_board_init_r_ofs:
293		- .word board_init_r - _start
294		-#endif
295		-
296	248	_rel_dyn_start_ofs:
297	249	.word __rel_dyn_start - _start
298	250	_rel_dyn_end_ofs:
299	251	.word __rel_dyn_end - _start
300	252	_dynsym_start_ofs:
301	253	.word __dynsym_start - _start
	254	+
302	255	#endif
	256	+
	257	+ .globl c_runtime_cpu_setup
	258	+c_runtime_cpu_setup:
	259	+
	260	+ bx lr
	261	+
303	262	/*
304	263	*************************************************************************
305	264	*