diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-05 21:24:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-25 09:27:27 +0200 |
| commit | 8e06d575edb7b3529b2f5744c9309f7668017966 (patch) | |
| tree | 01f269ac91787cbe7d95fca2daf46e170b7d9697 /drivers/mtd | |
| parent | 11632d1eb30fc8baf805b5bdf41833fe57d2788d (diff) | |
| download | barebox-8e06d575edb7b3529b2f5744c9309f7668017966.tar.gz barebox-8e06d575edb7b3529b2f5744c9309f7668017966.tar.xz | |
mtd nand: Fix compilation without bbt support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_write.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c index 13b6c8984f..5ed04cee57 100644 --- a/drivers/mtd/nand/nand_write.c +++ b/drivers/mtd/nand/nand_write.c @@ -72,7 +72,7 @@ int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs) chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1); /* Do we have a flash based bad block table ? */ - if (chip->options & NAND_USE_FLASH_BBT) + if (IS_ENABLED(CONFIG_NAND_BBT) && chip->options & NAND_USE_FLASH_BBT) ret = nand_update_bbt(mtd, ofs); else { /* We write two bytes, so we dont have to mess with 16 bit @@ -711,6 +711,9 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, if (bbt_masked_page == 0xffffffff || ret) return ret; + if (!IS_ENABLED(CONFIG_NAND_BBT)) + return ret; + for (chipnr = 0; chipnr < chip->numchips; chipnr++) { if (!rewrite_bbt[chipnr]) continue; |