V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mx6slevk: 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>
This commit is contained in:
Otavio Salvador 2014-01-16 19:58:04 -02:00 committed by Stefano Babic
parent f2e4288acb
commit 8e184a53b3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/configs/mx6slevk.h
View File

@ -76,7 +76,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" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
@ -93,22 +93,22 @@
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \ "bootscript=echo Running bootscript from mmc ...; " \
"source\0" \ "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" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${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" \
"netargs=setenv bootargs console=${console},${baudrate} " \ "netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs " \ "root=/dev/nfs " \
@ -120,19 +120,19 @@
"else " \ "else " \
"setenv get_cmd tftp; " \ "setenv get_cmd tftp; " \
"fi; " \ "fi; " \
"${get_cmd} ${uimage}; " \ "${get_cmd} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ "if ${get_cmd} ${fdt_addr} ${fdt_file}; 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 \
@ -141,7 +141,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 run netboot; " \ "else run netboot; " \
"fi; " \ "fi; " \