colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mx28evk: Set default environment to use zImage

Browse Source 
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:57:59 -02:00
committed by Stefano Babic
parent 04585b0638
commit fb3f917021
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/configs/mx28evk.h
View File

@@ -198,7 +198,7 @@
"else " \ "else " \
"setenv get_cmd tftp; " \ "setenv get_cmd tftp; " \
"fi; " \ "fi; " \
"${get_cmd} ${uimage}; " \ "${get_cmd} ${image}; " \
"nand write ${loadaddr} kernel ${filesize}\0" \ "nand write ${loadaddr} kernel ${filesize}\0" \
"update_nand_fdt=" /* Update fdt */ \ "update_nand_fdt=" /* Update fdt */ \
"mtdparts default; " \ "mtdparts default; " \
@@ -230,10 +230,10 @@
"nand read ${loadaddr} kernel 0x00400000; " \ "nand read ${loadaddr} kernel 0x00400000; " \
"if test ${boot_fdt} = yes; then " \ "if test ${boot_fdt} = yes; then " \
"nand read ${fdt_addr} fdt 0x00080000; " \ "nand read ${fdt_addr} fdt 0x00080000; " \
"bootm ${loadaddr} - ${fdt_addr}; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = no; then " \ "if test ${boot_fdt} = no; then " \
"bootm; " \ "bootz; " \
"else " \ "else " \
"echo \"ERROR: Set boot_fdt to yes or no.\"; " \ "echo \"ERROR: Set boot_fdt to yes or no.\"; " \
"fi; " \ "fi; " \
@@ -248,7 +248,7 @@
"fi ; " \ "fi ; " \
"fi\0" \ "fi\0" \
"script=boot.scr\0" \ "script=boot.scr\0" \
"uimage=uImage\0" \ "image=zImage\0" \
"console_fsl=ttyAM0\0" \ "console_fsl=ttyAM0\0" \
"console_mainline=ttyAMA0\0" \ "console_mainline=ttyAMA0\0" \
"fdt_file=imx28-evk.dtb\0" \ "fdt_file=imx28-evk.dtb\0" \
@@ -264,22 +264,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_mainline},${baudrate} " \ "netargs=setenv bootargs console=${console_mainline},${baudrate} " \
"root=/dev/nfs " \ "root=/dev/nfs " \
@@ -291,19 +291,19 @@
"else " \ "else " \
"setenv get_cmd tftp; " \ "setenv get_cmd tftp; " \
"fi; " \ "fi; " \
"${get_cmd} ${uimage}; " \ "${get_cmd} ${image}; " \
"if test ${boot_fdt} = yes; then " \ "if test ${boot_fdt} = yes; 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 \
@@ -311,7 +311,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; " \