diff options
| author | Scott Wood <scottwood@freescale.com> | 2008-10-29 13:42:41 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2008-10-29 13:42:41 -0500 |
| commit | f7fe57c09866b44692d18c8cf22828bd137ec58d (patch) | |
| tree | 29ac0c8a63daf8a61ead549bf40b9ee85b249fc8 /drivers | |
| parent | c013b74975dab0805ef6d369b013230c4e8a660d (diff) | |
| download | u-boot-imx-f7fe57c09866b44692d18c8cf22828bd137ec58d.zip u-boot-imx-f7fe57c09866b44692d18c8cf22828bd137ec58d.tar.gz u-boot-imx-f7fe57c09866b44692d18c8cf22828bd137ec58d.tar.bz2 | |
NAND fsl elbc: Set FMR[ECCM] based on page size.
Hardware expects ECCM 0 for small page and ECCM 1 for large page
when booting from NAND, so use those defaults.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/fsl_elbc_nand.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c index b097ca5..367c7d7 100644 --- a/drivers/mtd/nand/fsl_elbc_nand.c +++ b/drivers/mtd/nand/fsl_elbc_nand.c @@ -777,6 +777,20 @@ int board_nand_init(struct nand_chip *nand) nand->ecc.read_page = fsl_elbc_read_page; nand->ecc.write_page = fsl_elbc_write_page; +#ifdef CONFIG_FSL_ELBC_FMR + priv->fmr = CONFIG_FSL_ELBC_FMR; +#else + priv->fmr = (15 << FMR_CWTO_SHIFT) | (2 << FMR_AL_SHIFT); + + /* + * Hardware expects small page has ECCM0, large page has ECCM1 + * when booting from NAND. Board config can override if not + * booting from NAND. + */ + if (or & OR_FCM_PGS) + priv->fmr |= FMR_ECCM; +#endif + /* If CS Base Register selects full hardware ECC then use it */ if ((br & BR_DECC) == BR_DECC_CHK_GEN) { nand->ecc.mode = NAND_ECC_HW; @@ -793,8 +807,6 @@ int board_nand_init(struct nand_chip *nand) nand->ecc.mode = NAND_ECC_SOFT; } - priv->fmr = (15 << FMR_CWTO_SHIFT) | (2 << FMR_AL_SHIFT); - /* Large-page-specific setup */ if (or & OR_FCM_PGS) { priv->page_size = 1; |