Merge branch 'master' of git://www.denx.de/git/u-boot-imx

2014-11-05 12:48:09 -05:00
parent d5325eff10 0b23780ff0
commit 625509ab0e
34 changed files with 1822 additions and 39 deletions
--- 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)