[PoC 126/241] global: Migrate CONFIG_MXC_NAND_HWECC to CFG

Tom Rini
2022-11-20T14:13:02Z

drivers/mtd/nand/raw/mxc_nand.c | 4 ++--
include/configs/m53menlo.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 8aa5f7342131..78f5719bc6ef 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -372,7 +372,7 @@ static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on)
#endif
}

-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
{
/*
@@ -1179,7 +1179,7 @@ int board_nand_init(struct nand_chip *this)
#endif
host->clk_act = 1;

-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
this->ecc.calculate = mxc_nand_calculate_ecc;
this->ecc.hwctl = mxc_nand_enable_hwecc;
this->ecc.correct = mxc_nand_correct_data;
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 979fddab5e32..0684a9743a1c 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -48,7 +48,7 @@
#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI
#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR
#define CFG_SYS_NAND_LARGEPAGE
-#define CONFIG_MXC_NAND_HWECC
+#define CFG_MXC_NAND_HWECC
#endif

/*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8aa247c62448..2030e582de3f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -134,7 +134,7 @@ CFG_MONITOR_IS_IN_RAM
CFG_MTD_NAND_VERIFY_WRITE
CFG_MVGBE_PORTS
CFG_MXC_GPT_HCLK
-CONFIG_MXC_NAND_HWECC
+CFG_MXC_NAND_HWECC
CONFIG_MXC_NAND_IP_REGS_BASE
CONFIG_MXC_NAND_REGS_BASE
CONFIG_MXC_UART_BASE
--
2.25.1