[PoC 009/241] global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:30:00 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/watchdog/designware_wdt.c      | 2 +-
 include/configs/socfpga_common.h       | 2 +-
 include/configs/socfpga_soc64_common.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index cad756aeaf20..0eeb2efee2f5 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev)
 		goto err;
 	}
 #else
-	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
+	priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ;
 #endif
 
 	if (CONFIG_IS_ENABLED(DM_RESET)) {
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index bbbdea6664ca..807bff43e00a 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -64,7 +64,7 @@
 /*
  * L4 Watchdog
  */
-#define CONFIG_DW_WDT_CLOCK_KHZ		25000
+#define CFG_DW_WDT_CLOCK_KHZ		25000
 
 /*
  * NAND Support
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 47089f312d2c..df3927297bbe 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -90,10 +90,10 @@
 #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
 #ifndef __ASSEMBLY__
 unsigned int cm_get_l4_sys_free_clk_hz(void);
-#define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
+#define CFG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
 #endif
 #else
-#define CONFIG_DW_WDT_CLOCK_KHZ		100000
+#define CFG_DW_WDT_CLOCK_KHZ		100000
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43234d822457..97ad18677f1d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -9,7 +9,7 @@ CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
-CONFIG_DW_WDT_CLOCK_KHZ
+CFG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
-- 
2.25.1



More information about the U-Boot mailing list