summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-12-07 17:15:13 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-12-15 15:48:02 +0100
commit6a114b8985bbedd86f066007545ffea37cc70f3d (patch)
treea06d52f7e5c79f397d64a8d1347b0a61133ca02c
parentd4ad02080c1dc8523f50a54bde50e907cadda31e (diff)
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 <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr2
-rw-r--r--recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr2
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}'