[PoC 104/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:31:35 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index fb1fb2d7dccf..7de5c840ed9b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void)
 	       &lpc32xx_nand_slc_regs->icr);
 
 	/* Configure NAND flash timings */
-	writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) |
+	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5ba8c1bb20e2..dc16ed84c52c 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -41,7 +41,7 @@
 /*
  * NAND chip timings
  */
-#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc42b693e3e1..4f5de41ab95d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -112,7 +112,7 @@ CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
-CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
+CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-- 
2.25.1



More information about the U-Boot mailing list