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

[u-boot] / drivers / mtd / nand / jz4740_nand.c

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 3ec34f3c9b1d71fda10160f80c62472cf5f28263..9421e5661b9ad33a777034b705a0022e5f5021ed 100644 (file)
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -253,9 +253,10 @@ int board_nand_init(struct nand_chip *nand)
        nand->ecc.mode          = NAND_ECC_HW_OOB_FIRST;
        nand->ecc.size          = CONFIG_SYS_NAND_ECCSIZE;
        nand->ecc.bytes         = CONFIG_SYS_NAND_ECCBYTES;
+       nand->ecc.strength      = 4;
        nand->ecc.layout        = &qi_lb60_ecclayout_2gb;
        nand->chip_delay        = 50;
-       nand->options           = NAND_USE_FLASH_BBT;
+       nand->bbt_options       |= NAND_BBT_USE_FLASH;
 
        return 0;
 }