[PATCH] mtd: nand: Fix dependeny on CONFIG_NAND_BBT

Sascha Hauer s.hauer at pengutronix.de
Wed Nov 11 04:40:00 EST 2020


CONFIG_NAND_BBT no longer exists, so remove the remaining occurences.

Fixes: b6bcd96de5 ("mtd: nand: Update to Linux-5.9")
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 drivers/mtd/nand/Kconfig     | 1 -
 drivers/mtd/nand/nand_base.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 6a162f81f6..97819e5c0b 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -28,7 +28,6 @@ config NAND_IMX
 
 config NAND_MXS
 	bool
-	select NAND_BBT
 	select STMP_DEVICE
 	prompt "i.MX23/28/6 NAND driver"
 	depends on MXS_APBH_DMA
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index e9c3d7e7c8..2c3c0b360f 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -688,7 +688,7 @@ static int nand_block_markgood_lowlevel(struct nand_chip *chip, loff_t ofs)
 	}
 
 	/* Mark block good in BBT */
-	if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) {
+	if (chip->bbt) {
 		ret = nand_markgood_bbt(chip, ofs);
 		if (ret)
 			return ret;
-- 
2.20.1




More information about the barebox mailing list