| Message ID | 1297250276-16007-1-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Accepted |
| Commit | 428f7188890e29e5ad78306e800ff9a61ad037cf |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
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
Le 11/02/2011 19:58, Magnus Lilja a écrit : > 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. Which is the ideal case for sending out a "Tested-By:" line. :) > Best regards, Magnus Amicalement,
On 02/12/2011 08:07 AM, Albert ARIBAUD wrote: > Le 11/02/2011 19:58, Magnus Lilja a écrit : >> 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. > > Which is the ideal case for sending out a "Tested-By:" line. :) Tested-by: Magnus Lilja <lilja.magnus@gmail.com> Regards, Magnus
Hi Albert, On 2/13/2011 12:43 PM, Magnus Lilja wrote: > On 02/12/2011 08:07 AM, Albert ARIBAUD wrote: >> Le 11/02/2011 19:58, Magnus Lilja a écrit : >>> 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. >> >> Which is the ideal case for sending out a "Tested-By:" line. :) > > Tested-by: Magnus Lilja <lilja.magnus@gmail.com> > > Regards, Magnus > Ping? Stefano has already applied the patches 2/3 and 3/3 from this series, but without 1/3 MX31PDK boot is still broken. Regards, Fabio Estevam
Le 16/02/2011 12:58, Fabio Estevam a écrit : > Hi Albert, > > On 2/13/2011 12:43 PM, Magnus Lilja wrote: >> On 02/12/2011 08:07 AM, Albert ARIBAUD wrote: >>> Le 11/02/2011 19:58, Magnus Lilja a écrit : >>>> 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. >>> >>> Which is the ideal case for sending out a "Tested-By:" line. :) >> >> Tested-by: Magnus Lilja<lilja.magnus@gmail.com> >> >> Regards, Magnus >> > Ping? > > Stefano has already applied the patches 2/3 and 3/3 from this series, but without 1/3 MX31PDK boot is still broken. > > Regards, > > Fabio Estevam Applied to u-boot-arm/master, thanks. Amicalement,
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