From 467943daed3096543ba0cf3fb23d1c648d53f30c Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Mon, 15 Jan 2018 07:39:05 +0100 Subject: apalis/colibri: switch to zimage instead of uimage Switch to the generic compressed Kernel image type (zImage) instead of the U-Boot specific uImage format. Signed-off-by: Bhuvanchandra DV Signed-off-by: Marcel Ziswiler --- recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr | 2 +- recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr | 2 +- .../files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr | 2 +- .../files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr | 2 +- recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr | 2 +- recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr | 2 +- recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr | 2 +- recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr | 2 +- recipes-images/images/files/library/imx6/flash_blk.scr | 2 +- recipes-images/images/files/library/imx6/flash_eth.scr | 2 +- recipes-images/images/files/library/imx6/update.sh | 2 +- recipes-images/images/files/library/tegra/update.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'recipes-images') diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr b/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr index a0cc94a..8bdb6ef 100644 --- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr +++ b/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr @@ -25,7 +25,7 @@ setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/r setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr b/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr index 227ada8..3a01ae3 100644 --- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr +++ b/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr @@ -22,7 +22,7 @@ setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext3-${filenum} setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr index 286a029..5a9a430 100644 --- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr +++ b/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr @@ -12,7 +12,7 @@ setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/r setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr index 74dba08..99a2f46 100644 --- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr +++ b/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr @@ -9,7 +9,7 @@ setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr index 286a029..5a9a430 100644 --- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr +++ b/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr @@ -12,7 +12,7 @@ setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/r setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr index 74dba08..99a2f46 100644 --- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr +++ b/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr @@ -9,7 +9,7 @@ setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-apalis-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr b/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr index e45e69f..aefc08f 100644 --- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr +++ b/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr @@ -25,7 +25,7 @@ setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/r setenv update_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr b/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr index 9632c06..26eb0a3 100644 --- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr +++ b/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr @@ -22,7 +22,7 @@ setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext3-${filenum} setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb ${filesize}' diff --git a/recipes-images/images/files/library/imx6/flash_blk.scr b/recipes-images/images/files/library/imx6/flash_blk.scr index fb73fb6..12d89cf 100644 --- a/recipes-images/images/files/library/imx6/flash_blk.scr +++ b/recipes-images/images/files/library/imx6/flash_blk.scr @@ -20,7 +20,7 @@ setenv update_spl 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/SPL setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}' setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' -setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}' diff --git a/recipes-images/images/files/library/imx6/flash_eth.scr b/recipes-images/images/files/library/imx6/flash_eth.scr index f14fd23..ee91523 100644 --- a/recipes-images/images/files/library/imx6/flash_eth.scr +++ b/recipes-images/images/files/library/imx6/flash_eth.scr @@ -18,7 +18,7 @@ setenv update_spl 'tftpboot ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}' setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' -setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}' setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}' diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh index ddfcc2c..b624ba6 100755 --- a/recipes-images/images/files/library/imx6/update.sh +++ b/recipes-images/images/files/library/imx6/update.sh @@ -54,7 +54,7 @@ Usage() } # initialise options -KERNEL_IMAGETYPE="uImage" +KERNEL_IMAGETYPE="zImage" MIN_PARTITION_FREE_SIZE=100 MODTYPE_DETECT=0 OUT_DIR="" diff --git a/recipes-images/images/files/library/tegra/update.sh b/recipes-images/images/files/library/tegra/update.sh index f7ec906..f54a56b 100755 --- a/recipes-images/images/files/library/tegra/update.sh +++ b/recipes-images/images/files/library/tegra/update.sh @@ -70,7 +70,7 @@ BOOT_DEVICE=nand EMMC_PARTS="mbr.bin boot.vfat" # no devicetree by default KERNEL_DEVICETREE="" -KERNEL_IMAGETYPE="uImage" +KERNEL_IMAGETYPE="zImage" MIN_PARTITION_FREE_SIZE=300 MODTYPE_DETECT=0 -- cgit v1.2.3