diff options
| author | Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | 2013-06-08 21:00:15 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-06-18 20:35:16 (GMT) |
| commit | eab227645882ccf664cd405fcf6b726e6af25ac0 (patch) | |
| tree | 398e39bb51abb94fafbfa9b0ab66067add3e769c | |
| parent | 211bf20c35838b2181e8d04fd7ce8a7ac6e68db1 (diff) | |
| download | u-boot-fsl-qoriq-eab227645882ccf664cd405fcf6b726e6af25ac0.tar.xz | |
mtd: nand: fix initialization of BBT options
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>
| -rw-r--r-- | drivers/mtd/nand/jz4740_nand.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/s3c2410_nand.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c index a691fbc..9421e56 100644 --- a/drivers/mtd/nand/jz4740_nand.c +++ b/drivers/mtd/nand/jz4740_nand.c @@ -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; } diff --git a/drivers/mtd/nand/s3c2410_nand.c b/drivers/mtd/nand/s3c2410_nand.c index 43d8213..1187b9f 100644 --- a/drivers/mtd/nand/s3c2410_nand.c +++ b/drivers/mtd/nand/s3c2410_nand.c @@ -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"); |