[U-Boot] [RFC] ARM: mx31pdk: Use the new relocation scheme

Fabio Estevam
2011-02-08T17:09:46Z

Hi Stefano,

On 2/7/2011 5:48 PM, Magnus Lilja wrote:
...
>
> Here's a somewhat cleaner version of my patch. Hope the mail looks ok, I'm having internet connectivity issues this evening so I'm using a different installation of Thunderbird than usual.
>
> Regards, Magnus
>
> 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

I confirmed that by applying my original patch of this thread plus Magnus? patch above I can get MX31PDK to boot.

Please let me know how you want me to proceed.

Thanks,

Fabio Estevam