aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm1136/start.S
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-02-09 01:17:54 +0000
committerAlbert Aribaud <albert.aribaud@free.fr>2011-02-21 08:30:55 +0100
commit428f7188890e29e5ad78306e800ff9a61ad037cf (patch)
tree49e4c302507af46a49fce35c55479302625b7b9f /arch/arm/cpu/arm1136/start.S
parent3a8a83e08d832dc14e715f046aaf0d010d36c523 (diff)
downloadu-boot-linaro-stable-428f7188890e29e5ad78306e800ff9a61ad037cf.tar.gz
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>
Diffstat (limited to 'arch/arm/cpu/arm1136/start.S')
-rw-r--r--arch/arm/cpu/arm1136/start.S16
1 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S
index b771d316e..bab286848 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