Signed-off-by: Sascha Hauer <[email protected]>
---
drivers/mtd/nand/nand_write.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c
index 13b6c89..5ed04ce 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;
--
1.7.10
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
