| Message ID | 1389319859-18547-1-git-send-email-Po.Liu@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | York Sun |
| Headers | show |
On Fri, 2014-01-10 at 10:10 +0800, Po Liu wrote: > Using the TPL method for nand boot by sram was already > supported. Here add some code for mpc85xx ifc nand boot. > > - For ifc, elbc, esdhc, espi, all need the SPL without > section .resetvec. > - Use a clear function name for nand spl boot. > - Add CONFIG_SPL_DRIVERS_MISC_SUPPORT to compile the fsl_ifc.c > in spl/Makefile; > > Signed-off-by: Po Liu <Po.Liu@freescale.com> > --- > changes for v2: > - seperate public code and c29xpcie board code > - add ifc support > changes for v3: > - remove the redundant plus > - ifc support use CONFIG_SPL_DRIVERS_MISC_SUPPORT > changes for v4: > - modify the nand_load function > - add comments in README.SPL > changes for v5: > -none > changes for v6: > - modify the readme file for the include lib file > > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 ++++++++------- > doc/README.SPL | 1 + > drivers/mtd/nand/fsl_ifc_spl.c | 31 ++++++++++++++++++++++++------- > spl/Makefile | 1 + > 4 files changed, 34 insertions(+), 14 deletions(-) Acked-by: Scott Wood <scottwood@freescale.com> -Scott
On 1/10/2014 7:40 AM, Po Liu wrote: > Using the TPL method for nand boot by sram was already > supported. Here add some code for mpc85xx ifc nand boot. > > - For ifc, elbc, esdhc, espi, all need the SPL without > section .resetvec. > - Use a clear function name for nand spl boot. > - Add CONFIG_SPL_DRIVERS_MISC_SUPPORT to compile the fsl_ifc.c > in spl/Makefile; > > Signed-off-by: Po Liu <Po.Liu@freescale.com> > --- > changes for v2: > - seperate public code and c29xpcie board code > - add ifc support > changes for v3: > - remove the redundant plus > - ifc support use CONFIG_SPL_DRIVERS_MISC_SUPPORT > changes for v4: > - modify the nand_load function > - add comments in README.SPL > changes for v5: > -none > changes for v6: > - modify the readme file for the include lib file > > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 ++++++++------- > doc/README.SPL | 1 + > drivers/mtd/nand/fsl_ifc_spl.c | 31 ++++++++++++++++++++++++------- > spl/Makefile | 1 + > 4 files changed, 34 insertions(+), 14 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > index bc13267..acaa093 100644 > --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > @@ -57,7 +57,14 @@ SECTIONS > . = ALIGN(8); > __init_begin = .; > __init_end = .; > -/* FIXME for non-NAND SPL */ > + > +/* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */ > +#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > + .bootpg ADDR(.text) - 0x1000 : > + { > + KEEP(*(.bootpg)) > + } :text = 0xffff > +#else > #if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */ > .bootpg ADDR(.text) + 0x1000 : > { > @@ -69,12 +76,6 @@ SECTIONS > #else > #error unknown NAND controller > #endif > -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > - .bootpg ADDR(.text) - 0x1000 : > - { > - KEEP(*(.bootpg)) > - } :text = 0xffff > -#else > .resetvec ADDR(.text) + RESET_VECTOR_OFFSET : { > KEEP(*(.resetvec)) > } = 0xffff > diff --git a/doc/README.SPL b/doc/README.SPL > index 312a6a6..b1bc3ca 100644 > --- a/doc/README.SPL > +++ b/doc/README.SPL > @@ -62,6 +62,7 @@ CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o) > CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o) > CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o) > CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o) > +CONFIG_SPL_DRIVERS_MISC_SUPPORT (drivers/misc) > CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o) > CONFIG_SPL_POST_MEM_SUPPORT (post/drivers/memory.o) > CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/nand_spl_load.o) > diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c > index 9de327b..6b43496 100644 > --- a/drivers/mtd/nand/fsl_ifc_spl.c > +++ b/drivers/mtd/nand/fsl_ifc_spl.c > @@ -88,7 +88,11 @@ static inline int bad_block(uchar *marker, int port_size) > return __raw_readw((u16 *)marker) != 0xffff; > } > > -static void nand_load(unsigned int offs, int uboot_size, uchar *dst) > +#ifdef CONFIG_TPL_BUILD > +int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) > +#else > +static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) > +#endif nand_load definition is static void nand_load(unsigned int offs, int uboot_size, uchar *dst); have you checked the compilation warning for non TPL framework? Regards, Prabhakar
On Mon, 2014-01-13 at 11:58 +0530, Prabhakar Kushwaha wrote: > On 1/10/2014 7:40 AM, Po Liu wrote: > > diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c > > index 9de327b..6b43496 100644 > > --- a/drivers/mtd/nand/fsl_ifc_spl.c > > +++ b/drivers/mtd/nand/fsl_ifc_spl.c > > @@ -88,7 +88,11 @@ static inline int bad_block(uchar *marker, int port_size) > > return __raw_readw((u16 *)marker) != 0xffff; > > } > > > > -static void nand_load(unsigned int offs, int uboot_size, uchar *dst) > > +#ifdef CONFIG_TPL_BUILD > > +int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) > > +#else > > +static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) > > +#endif > > nand_load definition is > static void nand_load(unsigned int offs, int uboot_size, uchar *dst); Not anymore... > have you checked the compilation warning for non TPL framework? Are you seeing a warning? -Scott
On 1/14/2014 6:39 AM, Scott Wood wrote: > On Mon, 2014-01-13 at 11:58 +0530, Prabhakar Kushwaha wrote: >> On 1/10/2014 7:40 AM, Po Liu wrote: >>> diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c >>> index 9de327b..6b43496 100644 >>> --- a/drivers/mtd/nand/fsl_ifc_spl.c >>> +++ b/drivers/mtd/nand/fsl_ifc_spl.c >>> @@ -88,7 +88,11 @@ static inline int bad_block(uchar *marker, int port_size) >>> return __raw_readw((u16 *)marker) != 0xffff; >>> } >>> >>> -static void nand_load(unsigned int offs, int uboot_size, uchar *dst) >>> +#ifdef CONFIG_TPL_BUILD >>> +int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) >>> +#else >>> +static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) >>> +#endif >> nand_load definition is >> static void nand_load(unsigned int offs, int uboot_size, uchar *dst); > Not anymore... Just confused with previous fsl_ifc_spl.c file. Actually this patch is changing nand_load signature. No warning. I checked for BSC9131RDB, P1010 NAND target. Thanks, Prabhakar
On 01/10/2014 11:03 AM, Scott Wood wrote: > On Fri, 2014-01-10 at 10:10 +0800, Po Liu wrote: >> Using the TPL method for nand boot by sram was already >> supported. Here add some code for mpc85xx ifc nand boot. >> >> - For ifc, elbc, esdhc, espi, all need the SPL without >> section .resetvec. >> - Use a clear function name for nand spl boot. >> - Add CONFIG_SPL_DRIVERS_MISC_SUPPORT to compile the fsl_ifc.c >> in spl/Makefile; >> >> Signed-off-by: Po Liu <Po.Liu@freescale.com> >> --- >> changes for v2: >> - seperate public code and c29xpcie board code >> - add ifc support >> changes for v3: >> - remove the redundant plus >> - ifc support use CONFIG_SPL_DRIVERS_MISC_SUPPORT >> changes for v4: >> - modify the nand_load function >> - add comments in README.SPL >> changes for v5: >> -none >> changes for v6: >> - modify the readme file for the include lib file >> >> arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 ++++++++------- >> doc/README.SPL | 1 + >> drivers/mtd/nand/fsl_ifc_spl.c | 31 ++++++++++++++++++++++++------- >> spl/Makefile | 1 + >> 4 files changed, 34 insertions(+), 14 deletions(-) > > Acked-by: Scott Wood <scottwood@freescale.com> > Applied to u-boot-mpc85xx master branch. Awaiting upstream. York
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index bc13267..acaa093 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -57,7 +57,14 @@ SECTIONS . = ALIGN(8); __init_begin = .; __init_end = .; -/* FIXME for non-NAND SPL */ + +/* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */ +#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC + .bootpg ADDR(.text) - 0x1000 : + { + KEEP(*(.bootpg)) + } :text = 0xffff +#else #if defined(CONFIG_FSL_IFC) /* Restrict bootpg at 4K boundry for IFC */ .bootpg ADDR(.text) + 0x1000 : { @@ -69,12 +76,6 @@ SECTIONS #else #error unknown NAND controller #endif -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC - .bootpg ADDR(.text) - 0x1000 : - { - KEEP(*(.bootpg)) - } :text = 0xffff -#else .resetvec ADDR(.text) + RESET_VECTOR_OFFSET : { KEEP(*(.resetvec)) } = 0xffff diff --git a/doc/README.SPL b/doc/README.SPL index 312a6a6..b1bc3ca 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -62,6 +62,7 @@ CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o) CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o) CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o) CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o) +CONFIG_SPL_DRIVERS_MISC_SUPPORT (drivers/misc) CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o) CONFIG_SPL_POST_MEM_SUPPORT (post/drivers/memory.o) CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/nand_spl_load.o) diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c index 9de327b..6b43496 100644 --- a/drivers/mtd/nand/fsl_ifc_spl.c +++ b/drivers/mtd/nand/fsl_ifc_spl.c @@ -88,7 +88,11 @@ static inline int bad_block(uchar *marker, int port_size) return __raw_readw((u16 *)marker) != 0xffff; } -static void nand_load(unsigned int offs, int uboot_size, uchar *dst) +#ifdef CONFIG_TPL_BUILD +int nand_spl_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) +#else +static int nand_load(uint32_t offs, unsigned int uboot_size, void *vdst) +#endif { struct fsl_ifc *ifc = IFC_BASE_ADDR; uchar *buf = (uchar *)CONFIG_SYS_NAND_BASE; @@ -105,6 +109,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst) int sram_addr; int pg_no; + uchar *dst = vdst; /* Get NAND Flash configuration */ csor = CONFIG_SYS_NAND_CSOR; @@ -208,9 +213,20 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst) offs += page_size; } while ((offs & (blk_size - 1)) && (pos < uboot_size)); } + + return 0; } /* + * Defines a static function nand_load_image() here, because non-static makes + * the code too large for certain SPLs(minimal SPL, maximum size <= 4Kbytes) + */ +#ifndef CONFIG_TPL_BUILD +#define nand_spl_load_image(offs, uboot_size, vdst) \ + nand_load(offs, uboot_size, vdst) +#endif + +/* * Main entrypoint for NAND Boot. It's necessary that SDRAM is already * configured and available since this code loads the main U-boot image * from NAND into SDRAM and starts from there. @@ -221,16 +237,17 @@ void nand_boot(void) /* * Load U-Boot image from NAND into RAM */ - nand_load(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, - (uchar *)CONFIG_SYS_NAND_U_BOOT_DST); + nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, + CONFIG_SYS_NAND_U_BOOT_SIZE, + (uchar *)CONFIG_SYS_NAND_U_BOOT_DST); #ifdef CONFIG_NAND_ENV_DST - nand_load(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_NAND_ENV_DST); + nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, + (uchar *)CONFIG_NAND_ENV_DST); #ifdef CONFIG_ENV_OFFSET_REDUND - nand_load(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, - (uchar *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE); + nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, + (uchar *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE); #endif #endif /* diff --git a/spl/Makefile b/spl/Makefile index 1e88d74..4a0442b 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -72,6 +72,7 @@ LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \ drivers/power/pmic/ LIBS-$(if $(CONFIG_CMD_NAND),$(CONFIG_SPL_NAND_SUPPORT)) += drivers/mtd/nand/ +LIBS-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += drivers/misc/ LIBS-$(CONFIG_SPL_ONENAND_SUPPORT) += drivers/mtd/onenand/ LIBS-$(CONFIG_SPL_DMA_SUPPORT) += drivers/dma/ LIBS-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
Using the TPL method for nand boot by sram was already supported. Here add some code for mpc85xx ifc nand boot. - For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec. - Use a clear function name for nand spl boot. - Add CONFIG_SPL_DRIVERS_MISC_SUPPORT to compile the fsl_ifc.c in spl/Makefile; Signed-off-by: Po Liu <Po.Liu@freescale.com> --- changes for v2: - seperate public code and c29xpcie board code - add ifc support changes for v3: - remove the redundant plus - ifc support use CONFIG_SPL_DRIVERS_MISC_SUPPORT changes for v4: - modify the nand_load function - add comments in README.SPL changes for v5: -none changes for v6: - modify the readme file for the include lib file arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 ++++++++------- doc/README.SPL | 1 + drivers/mtd/nand/fsl_ifc_spl.c | 31 ++++++++++++++++++++++++------- spl/Makefile | 1 + 4 files changed, 34 insertions(+), 14 deletions(-)