[U-Boot] [PATCH 0/11] Change some boards to use zImage in default environment
Hello,
This patchset does as stated in the subject. It has been build tested as can be seen below:
Configuring for vf610twr - Board: vf610twr, Options: IMX_CONFIG=board/freescale/vf610twr/imximage.cfg text data bss dec hex filename 203367 8666 212712 424745 67b29 ./u-boot Configuring for udoo_quad - Board: udoo, Options: IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024 text data bss dec hex filename 217468 7882 218844 444194 6c722 ./u-boot Configuring for mx6slevk - Board: mx6slevk, Options: IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL text data bss dec hex filename 198964 7702 218568 425234 67d12 ./u-boot Configuring for mx6qsabresd - Board: mx6sabresd, Options: IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q text data bss dec hex filename 252239 58938 219028 530205 8171d ./u-boot Configuring for mx6qsabreauto - Board: mx6qsabreauto, Options: IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q text data bss dec hex filename 261433 9510 297784 568727 8ad97 ./u-boot Configuring for mx6qarm2 - Board: mx6qarm2, Options: IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg text data bss dec hex filename 192000 7414 218552 417966 660ae ./u-boot Configuring for mx53loco - Board: mx53loco, Options: IMX_CONFIG=board/freescale/mx53loco/imximage.cfg text data bss dec hex filename 281391 19282 307156 607829 94655 ./u-boot Configuring for mx51evk - Board: mx51evk, Options: IMX_CONFIG=board/freescale/mx51evk/imximage.cfg text data bss dec hex filename 268149 19126 301104 588379 8fa5b ./u-boot Configuring for mx28evk - Board: mx28evk, Options: ENV_IS_IN_MMC text data bss dec hex filename 431361 33206 326384 790951 c11a7 ./u-boot 6315 760 0 7075 1ba3 ./spl/u-boot-spl Configuring for mx23evk board... text data bss dec hex filename 209197 18636 304284 532117 81e95 ./u-boot 6307 164 0 6471 1947 ./spl/u-boot-spl Configuring for hummingboard_solo - Board: hummingboard, Options: IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512 text data bss dec hex filename 209614 7878 236376 453868 6ecec ./u-boot Configuring for cgtqmx6qeval - Board: cgtqmx6eval, Options: IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q text data bss dec hex filename 186342 7506 218632 412480 64b40 ./u-boot
--------------------- SUMMARY ---------------------------- Boards compiled: 12 ----------------------------------------------------------
Regards,
Otavio Salvador (11): cgtqmx6eval: Set default environment to use zImage hummingboard: Set default environment to use zImage mx23evk: Set default environment to use zImage mx28evk: Set default environment to use zImage mx51evk: Set default environment to use zImage mx53loco: Set default environment to use zImage mx6qarm2: Set default environment to use zImage mx6sabre_common: Set default environment to use zImage mx6slevk: Set default environment to use zImage udoo: Set default environment to use zImage vf610twr: Set default environment to use zImage
include/configs/cgtqmx6eval.h | 14 +++++++------- include/configs/hummingboard.h | 20 ++++++++++---------- include/configs/mx23evk.h | 12 ++++++------ include/configs/mx28evk.h | 26 +++++++++++++------------- include/configs/mx51evk.h | 20 ++++++++++---------- include/configs/mx53loco.h | 20 ++++++++++---------- include/configs/mx6qarm2.h | 10 +++++----- include/configs/mx6sabre_common.h | 20 ++++++++++---------- include/configs/mx6slevk.h | 20 ++++++++++---------- include/configs/udoo.h | 20 ++++++++++---------- include/configs/vf610twr.h | 20 ++++++++++---------- 11 files changed, 101 insertions(+), 101 deletions(-)
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 ---
include/configs/cgtqmx6eval.h | 14 +++++++------- 1 file 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; " \
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 ---
include/configs/hummingboard.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 4055af5..ac65620 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -92,7 +92,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ "fdt_high=0xffffffff\0" \ @@ -124,22 +124,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 " \ @@ -151,19 +151,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 \ @@ -171,7 +171,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx23evk.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 1b40a36..b496892 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -84,7 +84,7 @@ "fi ; " \ "fi\0" \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttyAMA0\0" \ "fdt_file=imx23-evk.dtb\0" \ "fdt_addr=0x41000000\0" \ @@ -98,22 +98,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"
#define CONFIG_BOOTCOMMAND \ @@ -121,7 +121,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; " \
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 ---
include/configs/mx28evk.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 4fd67eb..9b9124a 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -198,7 +198,7 @@ "else " \ "setenv get_cmd tftp; " \ "fi; " \ - "${get_cmd} ${uimage}; " \ + "${get_cmd} ${image}; " \ "nand write ${loadaddr} kernel ${filesize}\0" \ "update_nand_fdt=" /* Update fdt */ \ "mtdparts default; " \ @@ -230,10 +230,10 @@ "nand read ${loadaddr} kernel 0x00400000; " \ "if test ${boot_fdt} = yes; then " \ "nand read ${fdt_addr} fdt 0x00080000; " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = no; then " \ - "bootm; " \ + "bootz; " \ "else " \ "echo "ERROR: Set boot_fdt to yes or no."; " \ "fi; " \ @@ -248,7 +248,7 @@ "fi ; " \ "fi\0" \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console_fsl=ttyAM0\0" \ "console_mainline=ttyAMA0\0" \ "fdt_file=imx28-evk.dtb\0" \ @@ -264,22 +264,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_mainline},${baudrate} " \ "root=/dev/nfs " \ @@ -291,19 +291,19 @@ "else " \ "setenv get_cmd tftp; " \ "fi; " \ - "${get_cmd} ${uimage}; " \ + "${get_cmd} ${image}; " \ "if test ${boot_fdt} = yes; 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 \ @@ -311,7 +311,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx51evk.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 1cff171..b389475 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -143,7 +143,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "fdt_file=imx51-babbage.dtb\0" \ "fdt_addr=0x91000000\0" \ "boot_fdt=try\0" \ @@ -157,22 +157,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=ttymxc0,${baudrate} " \ "root=/dev/nfs " \ @@ -184,20 +184,20 @@ "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 ERROR: Cannot load the DT; " \ "exit; " \ "fi; " \ "fi; " \ "else " \ - "bootm; " \ + "bootz; " \ "fi;\0"
#define CONFIG_BOOTCOMMAND \ @@ -205,7 +205,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx53loco.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index ae43ea3..77f8567 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -103,7 +103,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "fdt_file=imx53-qsb.dtb\0" \ "fdt_addr=0x71000000\0" \ "boot_fdt=try\0" \ @@ -116,22 +116,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=ttymxc0,${baudrate} " \ "root=/dev/nfs " \ @@ -143,20 +143,20 @@ "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 ERROR: Cannot load the DT; " \ "exit; " \ "fi; " \ "fi; " \ "else " \ - "bootm; " \ + "bootz; " \ "fi;\0"
#define CONFIG_BOOTCOMMAND \ @@ -164,7 +164,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx6qarm2.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index f0a82d1..fd651cf 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -72,7 +72,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttymxc3\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -85,16 +85,16 @@ "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" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ - "bootm\0" \ + "bootz\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ "run netargs; " \ - "dhcp ${uimage}; bootm\0" \ + "dhcp ${image}; bootz\0" \
#define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev};" \ @@ -102,7 +102,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx6sabre_common.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 5ee7fa5..4efcebf 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -119,7 +119,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ @@ -150,22 +150,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 " \ @@ -177,19 +177,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 \ @@ -198,7 +198,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/mx6slevk.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index b29f78c..5d88dc4 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -76,7 +76,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -93,22 +93,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 " \ @@ -120,19 +120,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 \ @@ -141,7 +141,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
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 ---
include/configs/udoo.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 614e1fe..7f09489 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -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; " \
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 ---
include/configs/vf610twr.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 8d0a00d..500fd2f 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -81,7 +81,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttyLP1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -112,22 +112,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 " \ @@ -139,19 +139,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 \ @@ -159,7 +159,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \
Dear Otavio Salvador,
In message 1389909486-12880-1-git-send-email-otavio@ossystems.com.br you wrote:
This patchset does as stated in the subject. It has been build tested as can be seen below:
What is the motivation for this change? Using zImage is - from the technical point of view - the poorest of the available choices. If you are not happy with using uImages, then why do you not move forward and use FIT images?
Best regards,
Wolfgang Denk
On Thursday, January 16, 2014 at 11:14:44 PM, Wolfgang Denk wrote:
Dear Otavio Salvador,
In message 1389909486-12880-1-git-send-email-otavio@ossystems.com.br you
wrote:
This patchset does as stated in the subject. It has been build tested
as can be seen below:
What is the motivation for this change? Using zImage is - from the technical point of view - the poorest of the available choices. If you are not happy with using uImages, then why do you not move forward and use FIT images?
I am with you here. zImage is not a good format, since it's inflexible and not protected by anything (no checksum etc) at all. For deployment, it's even more poor choice.
Best regards, Marek Vasut
On Thursday, January 16, 2014 at 11:14:44 PM, Wolfgang Denk wrote:
Dear Otavio Salvador,
In message 1389909486-12880-1-git-send-email-otavio@ossystems.com.br you
wrote:
This patchset does as stated in the subject. It has been build tested
as can be seen below:
What is the motivation for this change? Using zImage is - from the technical point of view - the poorest of the available choices. If you are not happy with using uImages, then why do you not move forward and use FIT images?
I see the patchset was applied, but this question was not answered.
Best regards, Marek Vasut
Hi Marek,
On 11/02/2014 14:15, Marek Vasut wrote:
On Thursday, January 16, 2014 at 11:14:44 PM, Wolfgang Denk wrote:
Dear Otavio Salvador,
In message 1389909486-12880-1-git-send-email-otavio@ossystems.com.br you
wrote:
This patchset does as stated in the subject. It has been build tested
as can be seen below:
What is the motivation for this change? Using zImage is - from the technical point of view - the poorest of the available choices. If you are not happy with using uImages, then why do you not move forward and use FIT images?
I see the patchset was applied, but this question was not answered.
I have not seen the question, sorry. Rather patchwork did not show me the right thread, as it showed me only the comments for Patches 1-11 :-(
Anyway, I think the discussion is a bit away from which is the best image. IMHO the board maintainer can decide which is the more suitable default environment he needs, and in this case, he decided for a "raw image" like zimage. We can argument which is the best one as on the ARM ML, but I have no other arguments to block such kind of patches.
I am missing Simon's patches to move the "default" environment outside of the configuration file: I can imagine that using different ".env" can solve part of the problems we have with CONFIG_EXTRA_ENV_SETTINGS, that is become more and more complex, and can help to fine tuning the default environment.
Best regards, Stefano Babic
On Tuesday, February 11, 2014 at 03:16:51 PM, Stefano Babic wrote:
Hi Marek,
On 11/02/2014 14:15, Marek Vasut wrote:
On Thursday, January 16, 2014 at 11:14:44 PM, Wolfgang Denk wrote:
Dear Otavio Salvador,
In message 1389909486-12880-1-git-send-email-otavio@ossystems.com.br you
wrote:
This patchset does as stated in the subject. It has been build tested
as can be seen below:
What is the motivation for this change? Using zImage is - from the technical point of view - the poorest of the available choices. If you are not happy with using uImages, then why do you not move forward and use FIT images?
I see the patchset was applied, but this question was not answered.
I have not seen the question, sorry. Rather patchwork did not show me the right thread, as it showed me only the comments for Patches 1-11 :-(
Anyway, I think the discussion is a bit away from which is the best image. IMHO the board maintainer can decide which is the more suitable default environment he needs
So, do we now accept new built-in environment changes again? I will re-submit my changes to the default environment for the boards I maintain if you don't mind then.
Also, I don't see Otavio being the maintainer of most of these boards.
[...]
Best regards, Marek Vasut
Hi Marek,
On 12/02/2014 08:49, Marek Vasut wrote:
Anyway, I think the discussion is a bit away from which is the best image. IMHO the board maintainer can decide which is the more suitable default environment he needs
So, do we now accept new built-in environment changes again?
My good point to refuse them was that Simon's patches to move built-in environment to a .env file are quite ready to be merged. I will be happy if they can find the way to go in, as they can clean up the whole mess we have. Checking only the i.MXes boards, most CONFIG_EXTRA_ENV_SETTINGS are cut&paste from other boards, with some minor changes making them inconsistent. The good exception are the sabre boards, because they use the same common file.
I am taking a look if we can at least guarantee that all these boards can have the same built-in environment, because it seems clear that this is what we want to reach.
I will re-submit my changes to the default environment for the boards I maintain if you don't mind then.
I cannot refuse them, I cannot (yet) offer a good alternative. Send them.
Also, I don't see Otavio being the maintainer of most of these boards.
True, but maintainers (Fabio, Alison) were informed in CC. The patchset is quite a month old and I had to decide myself if there is a good reason to reject them - I cannot find it.
Best regards, Stefano Babic
On Wednesday, February 12, 2014 at 02:11:23 PM, Stefano Babic wrote:
Hi Marek,
On 12/02/2014 08:49, Marek Vasut wrote:
Anyway, I think the discussion is a bit away from which is the best image. IMHO the board maintainer can decide which is the more suitable default environment he needs
So, do we now accept new built-in environment changes again?
My good point to refuse them was that Simon's patches to move built-in environment to a .env file are quite ready to be merged. I will be happy if they can find the way to go in, as they can clean up the whole mess we have. Checking only the i.MXes boards, most CONFIG_EXTRA_ENV_SETTINGS are cut&paste from other boards, with some minor changes making them inconsistent. The good exception are the sabre boards, because they use the same common file.
I am taking a look if we can at least guarantee that all these boards can have the same built-in environment, because it seems clear that this is what we want to reach.
I will re-submit my changes to the default environment for the boards I maintain if you don't mind then.
I cannot refuse them, I cannot (yet) offer a good alternative. Send them.
Good. I will send them when ELDK 5.5 is out, by that time they will be final.
Also, I don't see Otavio being the maintainer of most of these boards.
True, but maintainers (Fabio, Alison) were informed in CC. The patchset is quite a month old and I had to decide myself if there is a good reason to reject them - I cannot find it.
Were the patches ACKed by either of them ? There was simply no activity, which does not look like a good enough reason to accept patches ...
Best regards, Marek Vasut
Hi Stefano,
On 12 February 2014 06:11, Stefano Babic sbabic@denx.de wrote:
Hi Marek,
On 12/02/2014 08:49, Marek Vasut wrote:
Anyway, I think the discussion is a bit away from which is the best image. IMHO the board maintainer can decide which is the more suitable default environment he needs
So, do we now accept new built-in environment changes again?
My good point to refuse them was that Simon's patches to move built-in environment to a .env file are quite ready to be merged. I will be happy if they can find the way to go in, as they can clean up the whole mess we have. Checking only the i.MXes boards, most CONFIG_EXTRA_ENV_SETTINGS are cut&paste from other boards, with some minor changes making them inconsistent. The good exception are the sabre boards, because they use the same common file.
I am not sure about the .env file patches. I am really not keen on creating another environment method which doesn't solve the problems of the existing one. I'll take another look at it sometime and see if there is any way to square the circle.
Regards, Simon
Hi Otavio,
On 16/01/2014 22:57, Otavio Salvador wrote:
Hello,
This patchset does as stated in the subject. It has been build tested as can be seen below:
Configuring for vf610twr - Board: vf610twr, Options: IMX_CONFIG=board/freescale/vf610twr/imximage.cfg text data bss dec hex filename 203367 8666 212712 424745 67b29 ./u-boot Configuring for udoo_quad - Board: udoo, Options: IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024 text data bss dec hex filename 217468 7882 218844 444194 6c722 ./u-boot Configuring for mx6slevk - Board: mx6slevk, Options: IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL text data bss dec hex filename 198964 7702 218568 425234 67d12 ./u-boot Configuring for mx6qsabresd - Board: mx6sabresd, Options: IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q text data bss dec hex filename 252239 58938 219028 530205 8171d ./u-boot Configuring for mx6qsabreauto - Board: mx6qsabreauto, Options: IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q text data bss dec hex filename 261433 9510 297784 568727 8ad97 ./u-boot Configuring for mx6qarm2 - Board: mx6qarm2, Options: IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg text data bss dec hex filename 192000 7414 218552 417966 660ae ./u-boot Configuring for mx53loco - Board: mx53loco, Options: IMX_CONFIG=board/freescale/mx53loco/imximage.cfg text data bss dec hex filename 281391 19282 307156 607829 94655 ./u-boot Configuring for mx51evk - Board: mx51evk, Options: IMX_CONFIG=board/freescale/mx51evk/imximage.cfg text data bss dec hex filename 268149 19126 301104 588379 8fa5b ./u-boot Configuring for mx28evk - Board: mx28evk, Options: ENV_IS_IN_MMC text data bss dec hex filename 431361 33206 326384 790951 c11a7 ./u-boot 6315 760 0 7075 1ba3 ./spl/u-boot-spl Configuring for mx23evk board... text data bss dec hex filename 209197 18636 304284 532117 81e95 ./u-boot 6307 164 0 6471 1947 ./spl/u-boot-spl Configuring for hummingboard_solo - Board: hummingboard, Options: IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512 text data bss dec hex filename 209614 7878 236376 453868 6ecec ./u-boot Configuring for cgtqmx6qeval - Board: cgtqmx6eval, Options: IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q text data bss dec hex filename 186342 7506 218632 412480 64b40 ./u-boot
--------------------- SUMMARY ---------------------------- Boards compiled: 12
Regards,
Whole patchset applied to u-boot-imx, thanks.
Best regards, Stefano Babic
participants (5)
-
Marek Vasut -
Otavio Salvador -
Simon Glass -
Stefano Babic -
Wolfgang Denk