[PoC 235/241] global: Migrate CONFIG_WATCHDOG_PRESC to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 15:17:37 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
 include/configs/kmcent2.h      | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 0abcc01b8574..68c3b1f98b8c 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -357,7 +357,7 @@ void
 init_85xx_watchdog(void)
 {
 	mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) |
-	      TCR_WP(CONFIG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
+	      TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
 }
 
 void
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index a7cc42c526c5..191ef7bb2870 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -377,7 +377,7 @@ int get_scl(void);
 /*
  * Hardware Watchdog
  */
-#define CONFIG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
+#define CFG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
 #define CONFIG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2e217a15b300..29c5ad21d3ef 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -250,7 +250,7 @@ CFG_VAR_SIZE_SPL
 CFG_VERY_BIG_RAM
 CFG_VSC7385_IMAGE
 CFG_VSC7385_IMAGE_SIZE
-CONFIG_WATCHDOG_PRESC
+CFG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
 CONFIG_X86EMU_RAW_IO
-- 
2.25.1



More information about the U-Boot mailing list