From b1be77e4d9c26003cd9c7b9149212a174d4099e3 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 10 Jun 2016 16:56:34 -0700 Subject: update.sh: create a static volume for the Cortex-M4 firmware Create a static UBI volume to store the Cortex-M4 firmware. Use 0xE0000 which makes the three static volumes exactly 9MiB. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr | 3 ++- recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr index 86564b3..b63366a 100644 --- a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr +++ b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr @@ -3,8 +3,9 @@ setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/co # Migrate to UBI volume based boot schema setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' setenv prepare_rootfs 'ubi create rootfs 0 dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' diff --git a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr index d2bae0f..13025de 100644 --- a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr +++ b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr @@ -3,14 +3,17 @@ setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && # Migrate to UBI volume based boot schema setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' setenv prepare_rootfs 'ubi create rootfs 0 dynamic' -setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' -setenv update 'mtdparts default; run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' +setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' +setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' +setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' echo 'enter "run update" to update the entire module' -- cgit v1.2.3