commit a85ef55b6c8e22a268d4f60c2a81f9765ce25a55
author Fabio Estevam <fabio.estevam@freescale.com> Wed Feb 09 01:17:54 2011 +0000
committer Albert Aribaud <albert.aribaud@free.fr> Mon Feb 21 08:30:55 2011 +0100
tree 49e4c302507af46a49fce35c55479302625b7b9f
parent e6b836eba8a587b5ed042ce786bd1c4f21c1b861

arm1136: Fix NAND boot

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Tested-by: Magnus Lilja <lilja.magnus@gmail.com>

arch/arm/cpu/arm1136/start.S

diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index b771d31..bab2868 100644
--- a/arch/arm/cpu/arm1136/start.S
+++ b/arch/arm/cpu/arm1136/start.S
@@ -163,15 +163,7 @@
 	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 @@
  */
 #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