| Message ID | 1370725215-2800-1-git-send-email-daniel.schwierzeck@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Scott Wood |
| Headers | show |
On Sat, Jun 08, 2013 at 11:00:15PM +0200, Daniel Schwierzeck wrote: > 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> Thanks -- I missed jz4740 because I don't have a MIPS toolchain, and s3c2410 because CONFIG_S3C2410_NAND_BBT is not defined in any config. Applied to u-boot-nand-flash. -Scott
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");
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> --- Patch is compile tested on boards smdk2410 and qi_lb60 --- drivers/mtd/nand/jz4740_nand.c | 2 +- drivers/mtd/nand/s3c2410_nand.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)