[PoC 236/241] global: Migrate CONFIG_WATCHDOG_RC to CFG

Tom Rini
2022-11-20T14:30:01Z

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 68c3b1f98b8c..e8a3e82765fc 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(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
+ TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CFG_WATCHDOG_RC));
}

void
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 191ef7bb2870..8e76924e8f0d 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -378,7 +378,7 @@ int get_scl(void);
* Hardware Watchdog
*/
#define CFG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */
-#define CONFIG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */
+#define CFG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */

/*
* For booting Linux, the board info and command line data
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 29c5ad21d3ef..c0bfa41ab9d8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -251,7 +251,7 @@ CFG_VERY_BIG_RAM
CFG_VSC7385_IMAGE
CFG_VSC7385_IMAGE_SIZE
CFG_WATCHDOG_PRESC
-CONFIG_WATCHDOG_RC
+CFG_WATCHDOG_RC
CONFIG_WATCHDOG_TIMEOUT
CONFIG_X86EMU_RAW_IO
CONFIG_X86_MRC_ADDR
--
2.25.1