Skip to content
Snippets Groups Projects
Commit 4ac0c2bf authored by Otavio Salvador's avatar Otavio Salvador Committed by Stefano Babic
Browse files

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: default avatarOtavio Salvador <otavio@ossystems.com.br>
parent 9a12fcd0
Branches
Tags
No related merge requests found
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"uimage=uImage\0" \ "image=zImage\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"boot_dir=/boot\0" \ "boot_dir=/boot\0" \
"console=ttymxc1\0" \ "console=ttymxc1\0" \
...@@ -92,24 +92,24 @@ ...@@ -92,24 +92,24 @@
"ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \ "bootscript=echo Running bootscript from mmc ...; " \
"source\0" \ "source\0" \
"loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ "loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
"${boot_dir}/${uimage}\0" \ "${boot_dir}/${image}\0" \
"loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \ "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \
"${boot_dir}/${fdt_file}\0" \ "${boot_dir}/${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \ "if run loadfdt; then " \
"bootm ${loadaddr} - ${fdt_addr}; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootm; " \ "bootz; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootm; " \ "bootz; " \
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
"if run loadbootscript; then " \ "if run loadbootscript; then " \
"run bootscript; " \ "run bootscript; " \
"else " \ "else " \
"if run loaduimage; then " \ "if run loadimage; then " \
"run mmcboot; " \ "run mmcboot; " \
"else "\ "else "\
"echo ERR: Fail to boot from mmc; " \ "echo ERR: Fail to boot from mmc; " \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment