@@ -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 */
@@ -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"\
@@ -136,6 +136,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_ETAMIN_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 */
@@ -273,7 +273,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"\
@@ -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 */
Perform a simple rename of CONFIG_ENV_SETTINGS_NAND_V2 to CFG_ENV_SETTINGS_NAND_V2 Signed-off-by: Tom Rini <trini@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 +- 5 files changed, 7 insertions(+), 7 deletions(-)