[PoC 036/241] global: Migrate CONFIG_FSL_ESDHC_PIN_MUX to CFG

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


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

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index d5066666698c..46f0a8b813e9 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -842,7 +842,7 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,
 #ifdef CONFIG_OF_LIBFDT
 __weak int esdhc_status_fixup(void *blob, const char *compat)
 {
-	if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
+	if (IS_ENABLED(CFG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
 		do_fixup_by_compat(blob, compat, "status", "disabled",
 				sizeof("disabled"), 1);
 		return 1;
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2eea26d7bee7..9af76e830dc0 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -204,7 +204,7 @@
 #endif
 
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC_PIN_MUX
+#define CFG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC83xx_ESDHC_ADDR
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43d331938d51..278fc032799a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -36,7 +36,7 @@ CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
-CONFIG_FSL_ESDHC_PIN_MUX
+CFG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
-- 
2.25.1



More information about the U-Boot mailing list