[PATCH 10/12] ARM: i.MX53 Vincell: Add NAND xload support

[Sascha Hauer]

On Mon, Jul 04, 2016 at 02:58:34PM +0200, Michael Grzeschik wrote:
> On Mon, Jul 04, 2016 at 11:27:37AM +0200, Sascha Hauer wrote:
> > The Vincell boards do the SDRAM setup from board init code, so the
> > image size is limited to the internal SRAM size. To overcome this
> > limitation use the NAND xload support.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> > ---
> >  arch/arm/boards/guf-vincell/lowlevel.c | 25 ++++++++++++++++++++++---
> >  arch/arm/mach-imx/Kconfig              |  9 +++++++++
> >  images/Makefile.imx                    | 14 ++++++++++----
> >  3 files changed, 41 insertions(+), 7 deletions(-)
> > 
> > diff --git a/arch/arm/boards/guf-vincell/lowlevel.c b/arch/arm/boards/guf-vincell/lowlevel.c
> > index f4bd44e..34c28f7 100644
> > --- a/arch/arm/boards/guf-vincell/lowlevel.c
> > +++ b/arch/arm/boards/guf-vincell/lowlevel.c
> > @@ -11,6 +11,7 @@
> >  #include <mach/generic.h>
> >  #include <asm/barebox-arm.h>
> >  #include <asm/barebox-arm-head.h>
> > +#include <mach/xload.h>
> >  
> >  #define IOMUX_PADCTL_DDRI_DDR (1 << 9)
> >  
> > @@ -127,8 +128,9 @@ static noinline void imx53_guf_vincell_init(void *fdt)
> >  {
> >  	void __iomem *ccm = (void *)MX53_CCM_BASE_ADDR;
> >  	u32 r;
> > +	enum bootsource src;
> > +	int instance;
> >  
> > -	imx5_cpu_lowlevel_init();
> >  	arm_setup_stack(0xf8020000 - 8);
> >  
> >  	writel(0x0088494c, ccm + MX5_CCM_CBCDR);
> > @@ -149,11 +151,28 @@ static noinline void imx53_guf_vincell_init(void *fdt)
> >  		disable_watchdog();
> >  		configure_dram_iomux();
> >  		imx_esdctlv4_init();
> > +
> > +		imx53_get_boot_source(&src, &instance);
> > +
> > +		if (src == BOOTSOURCE_NAND &&
> > +		    is_enabled(CONFIG_MACH_GUF_VINCELL_XLOAD))
> > +			imx53_nand_start_image();
> 
> This should probably be s/is_enabled/IS_ENABLED/ .

Yes, indeed. I thought I at least compile tested this change /o\

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |