|
@@ -100,7 +100,7 @@
|
|
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
"script=boot.scr\0" \
|
|
|
- "uimage=uImage\0" \
|
|
|
+ "image=zImage\0" \
|
|
|
"console=ttymxc1\0" \
|
|
|
"splashpos=m,m\0" \
|
|
|
"fdt_high=0xffffffff\0" \
|
|
@@ -132,22 +132,22 @@
|
|
|
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
|
"source\0" \
|
|
|
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
|
|
+ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
|
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
|
"run mmcargs; " \
|
|
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
|
"if run loadfdt; then " \
|
|
|
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
|
|
+ "bootz ${loadaddr} - ${fdt_addr}; " \
|
|
|
"else " \
|
|
|
"if test ${boot_fdt} = try; then " \
|
|
|
- "bootm; " \
|
|
|
+ "bootz; " \
|
|
|
"else " \
|
|
|
"echo WARN: Cannot load the DT; " \
|
|
|
"fi; " \
|
|
|
"fi; " \
|
|
|
"else " \
|
|
|
- "bootm; " \
|
|
|
+ "bootz; " \
|
|
|
"fi;\0" \
|
|
|
"netargs=setenv bootargs console=${console},${baudrate} " \
|
|
|
"root=/dev/nfs " \
|
|
@@ -159,19 +159,19 @@
|
|
|
"else " \
|
|
|
"setenv get_cmd tftp; " \
|
|
|
"fi; " \
|
|
|
- "${get_cmd} ${uimage}; " \
|
|
|
+ "${get_cmd} ${image}; " \
|
|
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
|
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
|
|
|
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
|
|
+ "bootz ${loadaddr} - ${fdt_addr}; " \
|
|
|
"else " \
|
|
|
"if test ${boot_fdt} = try; then " \
|
|
|
- "bootm; " \
|
|
|
+ "bootz; " \
|
|
|
"else " \
|
|
|
"echo WARN: Cannot load the DT; " \
|
|
|
"fi; " \
|
|
|
"fi; " \
|
|
|
"else " \
|
|
|
- "bootm; " \
|
|
|
+ "bootz; " \
|
|
|
"fi;\0"
|
|
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
@@ -179,7 +179,7 @@
|
|
|
"if run loadbootscript; then " \
|
|
|
"run bootscript; " \
|
|
|
"else " \
|
|
|
- "if run loaduimage; then " \
|
|
|
+ "if run loadimage; then " \
|
|
|
"run mmcboot; " \
|
|
|
"else run netboot; " \
|
|
|
"fi; " \
|