From 598dc9f2c85a0215f757e95d4c1e174bd865697e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 7 Dec 2015 17:15:13 +0100 Subject: colibri-imx6 flash scripts: move partconf setting to be last The command 'mmc partconf 0 1 1 0' seems to have no effect when it is in the middle of our migration cmdline resulting in U-Boot still being loaded from the user partition. Putting it as the last command seems to solve the issue. http://developer.toradex.com/software-resources/arm-family/linux/linux/release-details?view=all&issue=14774 Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr | 2 +- recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr index 474cab8..ad01a1f 100644 --- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr @@ -15,7 +15,7 @@ setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-b setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0; patch_ddr_size' +setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr index dee536b..d731df7 100644 --- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr @@ -12,7 +12,7 @@ setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_b setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0; patch_ddr_size' +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -- cgit v1.2.3