[PoC 055/241] global: Migrate CONFIG_HSMMC2_8BIT to CFG

Tom Rini
2022-11-20T13:52:44Z

drivers/mmc/omap_hsmmc.c | 2 +-
include/configs/am335x_shc.h | 2 +-
include/configs/am57xx_evm.h | 2 +-
include/configs/cm_t43.h | 2 +-
include/configs/dra7xx_evm.h | 2 +-
include/configs/omap5_uevm.h | 2 +-
scripts/config_whitelist.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index a2595d19e7f6..80dd70f087e2 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
#if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \
- defined(CONFIG_HSMMC2_8BIT)
+ defined(CFG_HSMMC2_8BIT)
/* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */
host_caps_val |= MMC_MODE_8BIT;
#endif
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index c66650c8e8d1..577a622d42c9 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -20,7 +20,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)

-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT

#ifndef CONFIG_SPL_BUILD
#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index dacfd41ccedf..afacf70e74a9 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -36,7 +36,7 @@
#include <configs/ti_omap5_common.h>

/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT

/* CPSW Ethernet */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 06de4dbeb6d5..5a795fe99171 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -36,7 +36,7 @@
* we don't need to do it twice.
*/

-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT

#include <configs/ti_armv7_omap.h>

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index ac3fcacc68ed..30def6abf8f4 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -49,7 +49,7 @@
#include <configs/ti_omap5_common.h>

/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT

/*
* Default to using SPI for environment, etc.
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index d7fa2d43914a..8a9a6dfc4c34 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -33,7 +33,7 @@
/* MMC ENV related defines */

/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT

/* Required support for the TCA642X GPIO we have on the uEVM */
#define CFG_SYS_I2C_TCA642X_BUS_NUM 4
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0fc29f456c13..d7265e370d05 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM
CFG_G_DNL_UMS_VENDOR_NUM
CFG_HDMI_ENCODER_I2C_ADDR
CFG_HOSTNAME
-CONFIG_HSMMC2_8BIT
+CFG_HSMMC2_8BIT
CONFIG_HW_ENV_SETTINGS
CONFIG_I2C_ENV_EEPROM_BUS
CONFIG_I2C_MULTI_BUS
--
2.25.1