[PoC 073/241] global: Migrate CONFIG_KM_NEW_ENV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h   | 4 ++--
 include/configs/kmcent2.h              | 4 ++--
 include/configs/socfpga_arria5_secu1.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 974486fc4c32..856d2e909200 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -209,7 +209,7 @@
 	"checkfdt=true\0"						\
 	""
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -223,7 +223,7 @@
 			"asrc,spdif,lpuart1,ftm1\0"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 35ec79f7b7db..97070bc77c45 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -428,7 +428,7 @@ int get_scl(void);
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -444,7 +444,7 @@ int get_scl(void);
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 71aa5a7ca949..6fb7a895995b 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -42,7 +42,7 @@
 	"_fpga_loadsafe=echo Loading FPGA SAFE image..." \
 		" && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \
 
-#define CONFIG_KM_NEW_ENV \
+#define CFG_KM_NEW_ENV \
 	"newenv=" \
 		"nand erase 0x100000 0x40000\0"
 
@@ -55,7 +55,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
 	CFG_KM_DEF_ENV_BOOTTARGETS \
-	CONFIG_KM_NEW_ENV \
+	CFG_KM_NEW_ENV \
 	"socfpga_legacy_reset_compat=1\0"	\
 	"altbootcmd=run bootcmd;\0"	\
 	"bootlimit=6\0"	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 11a501212b8c..471b3243f380 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
-CONFIG_KM_NEW_ENV
+CFG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
-- 
2.25.1