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 prabhakar@freescale.com --- Based upon git://git.denx.de/u-boot-mpc85xx.git branch next
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 7530962..8a33552 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 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 <asm/io.h> #include <asm/fsl_ifc.h> #include <linux/mtd/nand.h> +#ifndef CONFIG_SPL_INIT_MINIMAL +#include <linux/mtd/mtd.h> +#endif + +static void nand_load(unsigned int offs, int uboot_size, uchar *dst); + +#ifdef CONFIG_ENV_IS_IN_NAND +struct mtd_info nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; + +int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs) +{ + return 0; +} + +int nand_read_skip_bad(struct mtd_info *nand, loff_t offset, size_t *length, + size_t *actual, loff_t lim, u_char *buffer) +{ + nand_load(offset, *length, buffer); + return 0; +} +#endif +
static inline int is_blank(uchar *addr, int page_size) {