1 --- a/include/configs/wandboard.h
2 +++ b/include/configs/wandboard.h
4 #define CONFIG_CMD_BMODE
5 #define CONFIG_CMD_SETEXPR
7 -#define CONFIG_BOOTDELAY 5
8 +#define CONFIG_BOOTDELAY 3
10 #define CONFIG_SYS_MEMTEST_START 0x10000000
11 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
14 #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
15 #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
16 +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb"
17 #elif defined(CONFIG_MX6Q)
18 #define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
19 +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb"
22 #define CONFIG_EXTRA_ENV_SETTINGS \
25 + "image=" CONFIG_OWRT_NAME "\0" \
28 "fdt_high=0xffffffff\0" \
30 "mmcargs=setenv bootargs console=${console},${baudrate} " \
33 - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
34 + "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
35 "bootscript=echo Running bootscript from mmc ...; " \
37 - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
38 - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
39 + "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
40 + "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
41 "mmcboot=echo Booting from mmc ...; " \
43 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
50 - "netargs=setenv bootargs console=${console},${baudrate} " \
52 - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
53 - "netboot=echo Booting from net ...; " \
55 - "if test ${ip_dyn} = yes; then " \
56 - "setenv get_cmd dhcp; " \
58 - "setenv get_cmd tftp; " \
60 - "${get_cmd} ${image}; " \
61 - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
62 - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
63 - "bootz ${loadaddr} - ${fdt_addr}; " \
65 - "if test ${boot_fdt} = try; then " \
68 - "echo WARN: Cannot load the DT; " \
76 #define CONFIG_BOOTCOMMAND \
79 "if run loadimage; then " \
81 - "else run netboot; " \
82 + "else echo WARN: Can not boot the image; " \
85 - "else run netboot; fi"
88 /* Miscellaneous configurable options */
89 #define CONFIG_SYS_LONGHELP