[PoC 056/241] global: Migrate CONFIG_HW_ENV_SETTINGS to CFG

Tom Rini
2022-11-20T13:43:25Z

include/configs/km/pg-wcom-ls102xa.h | 4 ++--
include/configs/kmcent2.h | 4 ++--
scripts/config_whitelist.txt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index ddeabc0f79ce..80027f3a773a 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -217,7 +217,7 @@
"protect on " __stringify(ENV_DEL_ADDR) \
" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"

-#define CONFIG_HW_ENV_SETTINGS \
+#define CFG_HW_ENV_SETTINGS \
"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \
"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \
"asrc,spdif,lpuart1,ftm1\0"
@@ -225,7 +225,7 @@
#define CFG_EXTRA_ENV_SETTINGS \
CONFIG_KM_NEW_ENV \
CONFIG_KM_DEF_ENV \
- CONFIG_HW_ENV_SETTINGS \
+ CFG_HW_ENV_SETTINGS \
"EEprom_ivm=pca9547:70:9\0" \
"ethrotate=no\0" \
""
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 729278ebb246..d7d5bce15c59 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -423,7 +423,7 @@ int get_scl(void);
"fpgacfg=true\0" \
""

-#define CONFIG_HW_ENV_SETTINGS \
+#define CFG_HW_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \
"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \
"usb_dr_mode=host\0"
@@ -445,7 +445,7 @@ int get_scl(void);
CONFIG_KM_DEF_ENV \
CONFIG_KM_DEF_ARCH \
CONFIG_KM_NEW_ENV \
- CONFIG_HW_ENV_SETTINGS \
+ CFG_HW_ENV_SETTINGS \
"EEprom_ivm=pca9547:70:9\0" \
""

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d7265e370d05..44956bff3940 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -56,7 +56,7 @@ CFG_G_DNL_UMS_VENDOR_NUM
CFG_HDMI_ENCODER_I2C_ADDR
CFG_HOSTNAME
CFG_HSMMC2_8BIT
-CONFIG_HW_ENV_SETTINGS
+CFG_HW_ENV_SETTINGS
CONFIG_I2C_ENV_EEPROM_BUS
CONFIG_I2C_MULTI_BUS
CONFIG_I2C_MVTWSI
--
2.25.1