From: Scott Wood Date: Tue, 5 Nov 2013 19:42:27 -0600 Subject: [U-Boot] [PATCH 5/6][v2] SPL:Defines function required to env read for IFC & env_nand In-Reply-To: <1382675963-24883-1-git-send-email-prabhakar@freescale.com> References: <1382675963-24883-1-git-send-email-prabhakar@freescale.com> Message-ID: <1383702147.25829.128.camel@snotra.buserror.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, 2013-10-25 at 10:09 +0530, Prabhakar Kushwaha wrote: > fsl_ifs_spl.c reads data from NAND and store at a memory location in raw mode. > It does not used MTD layer. > To read env variable from NAND MTD layer read/write required. > > Hence, add mtd_block_isbad & nand_read_skip_bad function required during > env variable read. > > Also, avoid nand_info during env read for SPL > > Signed-off-by: Prabhakar Kushwaha > --- > Based upon git://git.denx.de/u-boot-mpc85xx.git branch next > > Changes for v2: Sending as it is > > common/env_nand.c | 4 ++++ > drivers/mtd/nand/fsl_ifc_spl.c | 22 ++++++++++++++++++++++ > 2 files changed, 26 insertions(+) > > diff --git a/common/env_nand.c b/common/env_nand.c > index 695a9ee..77ba003 100644 > --- a/common/env_nand.c > +++ b/common/env_nand.c > @@ -245,7 +245,11 @@ int readenv(size_t offset, u_char *buf) > size_t blocksize, len; > u_char *char_ptr; > > +#ifdef CONFIG_SPL_BUILD > + blocksize = CONFIG_ENV_SIZE;; > +#else > blocksize = nand_info[0].erasesize; > +#endif Extra semicolon As discussed earlier, use CONFIG_SYS_NAND_BLOCK_SIZE. > if (!blocksize) > return 1; > > diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c > index d462265..0db7142 100644 > --- a/drivers/mtd/nand/fsl_ifc_spl.c > +++ b/drivers/mtd/nand/fsl_ifc_spl.c > @@ -11,6 +11,28 @@ > #include > #include > #include > +#ifndef CONFIG_SPL_INIT_MINIMAL > +#include > +#endif I think you mean "#ifdef CONFIG_ENV_IS_IN_NAND", but in any case you usually shouldn't need to ifdef headers. -Scott