@@ -44,7 +44,7 @@
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=image raw 0 0x800000;"\
"u-boot raw 0 0x4000;"\
"bootimg part 0 1;"\
@@ -53,7 +53,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
UPDATE_M4_ENV \
CONFIG_MFG_ENV_SETTINGS \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc0\0" \
@@ -21,7 +21,7 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@
"fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"finduuid=part uuid mmc 0:1 uuid\0" \
"findfdt="\
"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
@@ -30,7 +30,7 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x400;" \
@@ -65,7 +65,7 @@
"ramdiskaddr=0x83000000\0" \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"mmcautodetect=yes\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"findfdt=" \
"if test $fdtfile = ask ; then " \
"bootmenu -1; fi;" \
@@ -15,7 +15,7 @@
/* MMC Config */
#define CFG_SYS_FSL_ESDHC_ADDR 0
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=" \
"spl raw 0x2 0x400;" \
"u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@
"ramdisk_addr_r=0x83000000\0" \
"ramdiskaddr=0x83000000\0" \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"findfdt=" \
"if test $fdtfile = ask ; then " \
"bootmenu -1; fi;" \
@@ -16,7 +16,7 @@
/* MMC Config*/
#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
/* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
- CONFIG_DFU_ENV_SETTINGS \
+ CFG_DFU_ENV_SETTINGS \
"script=boot.scr\0" \
"bootscr_fitimage_name=bootscr\0" \
"script_signed=boot.scr.imx-signed\0" \
@@ -4,7 +4,7 @@ CFG_DFU_ALT
CFG_DFU_ALT_BOOT_EMMC
CFG_DFU_ALT_BOOT_SD
CFG_DFU_ALT_SYSTEM
-CONFIG_DFU_ENV_SETTINGS
+CFG_DFU_ENV_SETTINGS
CONFIG_DM9000_BASE
CONFIG_DM9000_BYTE_SWAPPED
CONFIG_DM9000_NO_SROM
Signed-off-by: Tom Rini <trini@konsulko.com> --- include/configs/mx7dsabresd.h | 4 ++-- include/configs/pico-imx6.h | 4 ++-- include/configs/pico-imx6ul.h | 4 ++-- include/configs/pico-imx7d.h | 4 ++-- include/configs/warp7.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)