summaryrefslogtreecommitdiff
path: root/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-06-06 11:27:54 -0700
committerMax Krummenacher <max.krummenacher@toradex.com>2016-06-30 13:19:25 +0200
commit379eebf6059721ef36fd7db4851652b086cd1b76 (patch)
tree214b3dcc40e32106dc5ebf4d293af09c4194e7ef /recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr
parent76980cf65b0b6fe38ef71265c980c6cf48982fa6 (diff)
update.sh: imx7: write kernel and dt into static UBI volumes
Write kernel and device tree into seperate UBI Volumes. This allows to use a lot less UBI/UBIFS support in U-Boot, which should lower the risk of hitting bugs in this area. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr')
-rw-r--r--recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr12
1 files changed, 9 insertions, 3 deletions
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 1a24aa5..93d9be2 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
@@ -1,10 +1,16 @@
setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}'
-setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs'
+# Migrate to UBI volume based boot schema
+setenv prepare_kernel_dtb 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 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_dtb && run prepare_rootfs; fi; else run prepare_kernel_dtb && 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_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}'
+setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
+setenv update_dtb '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 update_rootfs; reset'
+setenv update 'mtdparts default; run update_uboot; run prepare_ubi && run update_kernel && run update_dtb && run update_rootfs; reset'
echo 'enter "run update" to update the entire module'