[PoC 014/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 6 +++---
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index d1c7abe1b392..5b0daec11a6a 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -36,6 +36,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index d6c313d18e2a..fea69c7eafae 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -93,8 +93,8 @@
 	"u-boot.env1 mtddev;" \
 	"rootfs mtddevubi" \
 
-#undef CONFIG_ENV_SETTINGS_NAND_V2
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#undef CFG_ENV_SETTINGS_NAND_V2
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
@@ -146,6 +146,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 2e002faf2e60..f3435b2b8c6c 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -46,6 +46,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 20efa468ac3d..b1cd614316d4 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -278,7 +278,7 @@
 	"u-boot.env1 part 0 7;" \
 	"rootfs partubi 0 9" \
 
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 25c5a8ccd20e..960b42dffd0e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -39,6 +39,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 25bfb7ee89e7..e55368c5453c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -14,7 +14,7 @@ CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
-CONFIG_ENV_SETTINGS_NAND_V2
+CFG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
-- 
2.25.1