]> git.sur5r.net Git - u-boot/commitdiff
mtd: nand: fix initialization of BBT options
authorDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Sat, 8 Jun 2013 21:00:15 +0000 (23:00 +0200)
committerScott Wood <scottwood@freescale.com>
Tue, 18 Jun 2013 20:35:16 +0000 (15:35 -0500)
commit dfe64e2c89731a3f9950d7acd8681b68df2bae03
Author: Sergey Lapin <slapin@ossfans.org>
Date:   Mon Jan 14 03:46:50 2013 +0000

    mtd: resync with Linux-3.7.1

changed the initialization of BBT options. Fix drivers
jz4740 and s3c2410 which have not been updated yet and
cause compile errors.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
drivers/mtd/nand/jz4740_nand.c
drivers/mtd/nand/s3c2410_nand.c

index a691fbc40397d747df6acf11f8872e2da89ddedd..9421e5661b9ad33a777034b705a0022e5f5021ed 100644 (file)
@@ -256,7 +256,7 @@ int board_nand_init(struct nand_chip *nand)
        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;
 }
index 43d8213e04a10b7c4add28d1d951fc013cf75ac2..1187b9fee4e9feb2272a9d3bd412cd0e7f395dd9 100644 (file)
@@ -179,9 +179,7 @@ int board_nand_init(struct nand_chip *nand)
 #endif
 
 #ifdef CONFIG_S3C2410_NAND_BBT
-       nand->options = NAND_USE_FLASH_BBT;
-#else
-       nand->options = 0;
+       nand->bbt_options |= NAND_BBT_USE_FLASH;
 #endif
 
        debug("end of nand_init\n");