From 641d28b48acb411de21342e3adff31a7a00f7190 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 7 Jun 2016 15:50:31 -0700 Subject: update.sh: imx7: use new U-Boot to flash modules U-Boot delivered with V2.6 Alpha1 does not have SoC type detection which can be used to load the device tree (imx7s/imx7d). Flash U-Boot first and reset to make sure we use the new U-Boot to flash the rest of the components. The later corrected the commit message. Signed-off-by: Stefan Agner Signed-off-by: Marcel Ziswiler --- recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0403305..ebf1be4 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 @@ -11,6 +11,8 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage setenv update_dtb 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' setenv update_rootfs 'fatload ${interface} 0:1 ${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_dtb && 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_dtb && run update_rootfs && reset' echo 'enter "run update" to update the entire module' -- cgit v1.2.3