summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-01-16 19:57:56 -0200
committerStefano Babic <sbabic@denx.de>2014-02-11 11:04:40 +0100
commit4ac0c2bfba3f2681e89a5f756cab019a58445b3c (patch)
tree518e5edacbf505a403f735d2aa0d42e9221402b5 /include
parent9a12fcd0c995e8a47971778cf31e19a44a605c0c (diff)
downloadu-boot-imx-4ac0c2bfba3f2681e89a5f756cab019a58445b3c.zip
u-boot-imx-4ac0c2bfba3f2681e89a5f756cab019a58445b3c.tar.gz
u-boot-imx-4ac0c2bfba3f2681e89a5f756cab019a58445b3c.tar.bz2
cgtqmx6eval: Set default environment to use zImage
Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'include')
-rw-r--r--include/configs/cgtqmx6eval.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 29a023c..b189bf1 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -75,7 +75,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
- "uimage=uImage\0" \
+ "image=zImage\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"boot_dir=/boot\0" \
"console=ttymxc1\0" \
@@ -92,24 +92,24 @@
"ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
- "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
- "${boot_dir}/${uimage}\0" \
+ "loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
+ "${boot_dir}/${image}\0" \
"loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \
"${boot_dir}/${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"
#define CONFIG_BOOTCOMMAND \
@@ -118,7 +118,7 @@
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
- "if run loaduimage; then " \
+ "if run loadimage; then " \
"run mmcboot; " \
"else "\
"echo ERR: Fail to boot from mmc; " \