Patchwork [U-Boot] ARM: Fix startup code to make booting from NAND work again.

login
register
mail settings
Submitter Magnus Lilja
Date Feb. 8, 2011, 7:24 p.m.
Message ID <1297193083-15001-1-git-send-email-lilja.magnus@gmail.com>
Download mbox | patch
Permalink /patch/82393/
State Superseded
Headers show

Comments

Magnus Lilja - Feb. 8, 2011, 7:24 p.m.
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
---

Note: I do think that this patch requires Fabio Estevam's patch
to be applied first since it touches the same lines ~269.

 arch/arm/cpu/arm1136/start.S |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

Patch

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index 12545c2..bab2868 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -163,15 +163,7 @@  call_board_init_f:
 	bic	sp, sp, #7 /* 8-byte alignment for ABI compliance */
 	ldr	r0,=0x00000000
 
-#ifdef CONFIG_NAND_SPL
-	bl	nand_boot
-#else
-#ifdef CONFIG_ONENAND_IPL
-	bl	start_oneboot
-#else
 	bl	board_init_f
-#endif /* CONFIG_ONENAND_IPL */
-#endif /* CONFIG_NAND_SPL */
 
 /*------------------------------------------------------------------------------*/
 
@@ -267,10 +259,10 @@  clbss_l:str	r2, [r0]		/* clear loop...		    */
  */
 #ifdef CONFIG_NAND_SPL
 	ldr     r0, _nand_boot_ofs
-	adr	r1, _start
-	add	pc, r0, r1
-_nand_boot_ofs:	
-	.word nand_boot - _start
+	mov	pc, r0
+
+_nand_boot_ofs:
+	.word nand_boot
 #else
 jump_2_ram:
 	ldr	r0, _board_init_r_ofs