@@ -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
@@ -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 */
@@ -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 \
@@ -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
@@ -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
@@ -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
Signed-off-by: Tom Rini <trini@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(-)