summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-05 12:48:09 -0500
committerTom Rini <trini@ti.com>2014-11-05 12:48:09 -0500
commit625509ab0edbb7d943ad9028de3c21ca48aa58be (patch)
tree2ea6bda524b3ad7e964f4357428de2890ad81cf4 /drivers
parentd5325eff10922acb11c39efece6d5f24de5b1998 (diff)
parent0b23780ff02bdbec46fac1fe4151e2ebf1eae881 (diff)
downloadu-boot-imx-625509ab0edbb7d943ad9028de3c21ca48aa58be.zip
u-boot-imx-625509ab0edbb7d943ad9028de3c21ca48aa58be.tar.gz
u-boot-imx-625509ab0edbb7d943ad9028de3c21ca48aa58be.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/mxs_nand.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 036c113..7a064ab 100644
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -146,8 +146,13 @@ static uint32_t mxs_nand_aux_status_offset(void)
static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size,
uint32_t page_oob_size)
{
- if (page_data_size == 2048)
- return 8;
+ if (page_data_size == 2048) {
+ if (page_oob_size == 64)
+ return 8;
+
+ if (page_oob_size == 112)
+ return 14;
+ }
if (page_data_size == 4096) {
if (page_oob_size == 128)