| Message ID | 1317824907-8693-1-git-send-email-hs@denx.de |
|---|---|
| State | Superseded |
| Headers | show |
On 10/05/2011 09:28 AM, Heiko Schocher wrote: > similiar to commit dc7cd8e59ba077f3b4c1a4557c9cd86a31b9ab1f, only > adapted for the new spl framework. > > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Scott Wood <scottwood@freescale.com> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > Cc: Sandeep Paulraj <s-paulraj@ti.com> > --- > drivers/mtd/nand/nand_spl_simple.c | 43 ++++++++++++++++++++++++++++++++++++ > 1 files changed, 43 insertions(+), 0 deletions(-) > > diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c > index 71491d4..7ab332f 100644 > --- a/drivers/mtd/nand/nand_spl_simple.c > +++ b/drivers/mtd/nand/nand_spl_simple.c > @@ -140,6 +140,47 @@ static int nand_is_bad_block(int block) > return 0; > } > > +#if defined(CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST) > +static int nand_read_page(int block, int page, uchar *dst) > +{ > + struct nand_chip *this = mtd.priv; > + u_char *ecc_calc; > + u_char *ecc_code; > + u_char *oob_data; > + int i; > + int eccsize = CONFIG_SYS_NAND_ECCSIZE; > + int eccbytes = CONFIG_SYS_NAND_ECCBYTES; > + int eccsteps = CONFIG_SYS_NAND_ECCSTEPS; > + uint8_t *p = dst; > + int stat; > + > + /* > + * No malloc available for now, just use some temporary locations > + * in SDRAM > + */ > + ecc_calc = (u_char *)(CONFIG_SYS_SDRAM_BASE + 0x10000); > + ecc_code = ecc_calc + 0x100; > + oob_data = ecc_calc + 0x200; > + > + nand_command(block, page, 0, NAND_CMD_READOOB); > + this->read_buf(&mtd, oob_data, CONFIG_SYS_NAND_OOBSIZE); > + nand_command(block, page, 0, NAND_CMD_READ0); > + > + /* Pick the ECC bytes out of the oob data */ > + for (i = 0; i < CONFIG_SYS_NAND_ECCTOTAL; i++) > + ecc_code[i] = oob_data[nand_ecc_pos[i]]; > + > + > + for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { > + this->ecc.hwctl(&mtd, NAND_ECC_READ); > + this->read_buf(&mtd, p, eccsize); > + this->ecc.calculate(&mtd, p, &ecc_calc[i]); > + stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); > + } > + > + return 0; > +} > +#else > static int nand_read_page(int block, int page, void *dst) > { > struct nand_chip *this = mtd.priv; > @@ -186,6 +227,7 @@ static int nand_read_page(int block, int page, void *dst) > > return 0; > } > +#endif > > int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) > { ACK this part > @@ -231,6 +273,7 @@ void nand_init(void) > nand_chip.IO_ADDR_R = nand_chip.IO_ADDR_W = > (void __iomem *)CONFIG_SYS_NAND_BASE; > nand_chip.options = 0; > + nand_chip.dev_ready = NULL; > board_nand_init(&nand_chip); > > if (nand_chip.select_chip) This looks unrelated, and if it makes a difference suggests that the BSS isn't being cleared. -Scott
Hello Scott, Scott Wood wrote: > On 10/05/2011 09:28 AM, Heiko Schocher wrote: >> similiar to commit dc7cd8e59ba077f3b4c1a4557c9cd86a31b9ab1f, only >> adapted for the new spl framework. >> >> Signed-off-by: Heiko Schocher <hs@denx.de> >> Cc: Scott Wood <scottwood@freescale.com> >> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> >> Cc: Sandeep Paulraj <s-paulraj@ti.com> >> --- >> drivers/mtd/nand/nand_spl_simple.c | 43 ++++++++++++++++++++++++++++++++++++ >> 1 files changed, 43 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c >> index 71491d4..7ab332f 100644 >> --- a/drivers/mtd/nand/nand_spl_simple.c >> +++ b/drivers/mtd/nand/nand_spl_simple.c [...] >> @@ -186,6 +227,7 @@ static int nand_read_page(int block, int page, void *dst) >> >> return 0; >> } >> +#endif >> >> int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) >> { > > ACK this part great! >> @@ -231,6 +273,7 @@ void nand_init(void) >> nand_chip.IO_ADDR_R = nand_chip.IO_ADDR_W = >> (void __iomem *)CONFIG_SYS_NAND_BASE; >> nand_chip.options = 0; >> + nand_chip.dev_ready = NULL; >> board_nand_init(&nand_chip); >> >> if (nand_chip.select_chip) > > This looks unrelated, and if it makes a difference suggests that the BSS > isn't being cleared. BSS is cleared at this point, so you are right, above two lines are not necessary, remove them. Thanks! bye, Heiko
diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c index 71491d4..7ab332f 100644 --- a/drivers/mtd/nand/nand_spl_simple.c +++ b/drivers/mtd/nand/nand_spl_simple.c @@ -140,6 +140,47 @@ static int nand_is_bad_block(int block) return 0; } +#if defined(CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST) +static int nand_read_page(int block, int page, uchar *dst) +{ + struct nand_chip *this = mtd.priv; + u_char *ecc_calc; + u_char *ecc_code; + u_char *oob_data; + int i; + int eccsize = CONFIG_SYS_NAND_ECCSIZE; + int eccbytes = CONFIG_SYS_NAND_ECCBYTES; + int eccsteps = CONFIG_SYS_NAND_ECCSTEPS; + uint8_t *p = dst; + int stat; + + /* + * No malloc available for now, just use some temporary locations + * in SDRAM + */ + ecc_calc = (u_char *)(CONFIG_SYS_SDRAM_BASE + 0x10000); + ecc_code = ecc_calc + 0x100; + oob_data = ecc_calc + 0x200; + + nand_command(block, page, 0, NAND_CMD_READOOB); + this->read_buf(&mtd, oob_data, CONFIG_SYS_NAND_OOBSIZE); + nand_command(block, page, 0, NAND_CMD_READ0); + + /* Pick the ECC bytes out of the oob data */ + for (i = 0; i < CONFIG_SYS_NAND_ECCTOTAL; i++) + ecc_code[i] = oob_data[nand_ecc_pos[i]]; + + + for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { + this->ecc.hwctl(&mtd, NAND_ECC_READ); + this->read_buf(&mtd, p, eccsize); + this->ecc.calculate(&mtd, p, &ecc_calc[i]); + stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); + } + + return 0; +} +#else static int nand_read_page(int block, int page, void *dst) { struct nand_chip *this = mtd.priv; @@ -186,6 +227,7 @@ static int nand_read_page(int block, int page, void *dst) return 0; } +#endif int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) { @@ -231,6 +273,7 @@ void nand_init(void) nand_chip.IO_ADDR_R = nand_chip.IO_ADDR_W = (void __iomem *)CONFIG_SYS_NAND_BASE; nand_chip.options = 0; + nand_chip.dev_ready = NULL; board_nand_init(&nand_chip); if (nand_chip.select_chip)
similiar to commit dc7cd8e59ba077f3b4c1a4557c9cd86a31b9ab1f, only adapted for the new spl framework. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com> --- drivers/mtd/nand/nand_spl_simple.c | 43 ++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-)