[PoC 012/241] global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG

[Tom Rini]

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

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 4869008da440..d1c7abe1b392 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -34,7 +34,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 6647148c96f4..d6c313d18e2a 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -56,7 +56,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -144,7 +144,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 586a7edcbb52..eafa6ae9a9a0 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -18,7 +18,7 @@
 #define DDR_IOCTRL_VAL		0x18b
 #define DDR_PLL_FREQ		266
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=59\0" \
 	"led0=117,0,1\0" \
 
@@ -34,7 +34,7 @@
 	"nand_img_size=0x500000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
 	CONFIG_ENV_SETTINGS_NAND_V1 \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 49cd11c17b44..2e002faf2e60 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -21,7 +21,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -44,7 +44,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 696306e46592..25c5a8ccd20e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -37,7 +37,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 040b0c89049a..cb880dc317fc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -12,7 +12,7 @@ CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
-CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
+CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
-- 
2.25.1