V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Fabio Estevam 2011-02-09 01:17:54 +00:00 committed by Albert Aribaud
parent 3a8a83e08d
commit 428f718889
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/cpu/arm1136/start.S
View File

@ -163,15 +163,7 @@ call_board_init_f:
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
ldr r0,=0x00000000 ldr r0,=0x00000000
#ifdef CONFIG_NAND_SPL
bl nand_boot
#else
#ifdef CONFIG_ONENAND_IPL
bl start_oneboot
#else
bl board_init_f 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 #ifdef CONFIG_NAND_SPL
ldr r0, _nand_boot_ofs ldr r0, _nand_boot_ofs
adr r1, _start mov pc, r0
add pc, r0, r1
_nand_boot_ofs _nand_boot_ofs:
: .word nand_boot - _start .word nand_boot
#else #else
jump_2_ram: jump_2_ram:
ldr r0, _board_init_r_ofs ldr r0, _board_init_r_ofs