[U-Boot] [PATCH 1/3] arm1136: Fix NAND boot

Magnus Lilja
2011-02-11T18:58:36Z

Hi

I've tested Fabio's patch series and it makes the i.MX31 PDK boot nicely from NAND again. So from my point of view I
recommend to use these patches.

Best regards, Magnus

On 02/09/2011 12:17 PM, Fabio Estevam wrote:
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
> ---
> arch/arm/cpu/arm1136/start.S | 16 ++++------------
> 1 files changed, 4 insertions(+), 12 deletions(-)
>
> 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 @@ 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