diff options
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-script-toradex')
12 files changed, 96 insertions, 254 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch deleted file mode 100644 index 5c62eb1..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 262b1dcc5f886ceb1944c8db3c1072c98d45a56e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:11:32 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 8 ++++---- | ||
8 | flash_eth.scr | 8 ++++---- | ||
9 | 2 files changed, 8 insertions(+), 8 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index 800383c..398c4de 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -30,16 +30,16 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa | ||
16 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
17 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
18 | |||
19 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
20 | -setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
21 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
22 | +setenv echo_migrate-it echo "successfully updated U-Boot" | ||
23 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
24 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
25 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
26 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
27 | |||
28 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
29 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
30 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
31 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
32 | setenv update_it 'setenv module_type -it; run update' | ||
33 | |||
34 | -echo 'enter "run update" or "run update_it" to update the entire module' | ||
35 | +echo 'enter "run update" or "run update_it" to update the uboot' | ||
36 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
37 | index 804c924..2f64288 100644 | ||
38 | --- a/flash_eth.scr | ||
39 | +++ b/flash_eth.scr | ||
40 | @@ -31,16 +31,16 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt | ||
41 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
42 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
43 | |||
44 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
45 | -setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
46 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
47 | +setenv echo_migrate-it echo "successfully updated U-Boot" | ||
48 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
49 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
50 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
51 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
52 | |||
53 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
54 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
55 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
56 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
57 | setenv update_it 'setenv module_type -it; run update' | ||
58 | |||
59 | -echo 'enter "run update" or "run update_it" to update the entire module' | ||
60 | +echo 'enter "run update" or "run update_it" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr deleted file mode 100644 index 398c4de..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | test -n ${interface} || setenv interface mmc | ||
2 | test -n ${drive} || setenv drive 1 | ||
3 | |||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
5 | setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
6 | |||
7 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
10 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
11 | |||
12 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
13 | |||
14 | setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
15 | setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
16 | |||
17 | 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}' | ||
18 | |||
19 | setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
20 | setenv update_uboot_it 'setenv module_type -it; run update_uboot' | ||
21 | |||
22 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
23 | |||
24 | setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
25 | |||
26 | setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
27 | |||
28 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
29 | setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
30 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
31 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
32 | |||
33 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
34 | setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
35 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
36 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
37 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
38 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
39 | |||
40 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
41 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
42 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
43 | setenv update_it 'setenv module_type -it; run update' | ||
44 | |||
45 | echo 'enter "run update" or "run update_it" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr deleted file mode 100644 index 2f64288..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
2 | #workaround U-Boot counting in hex and split did in decimal | ||
3 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | ||
4 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
5 | |||
6 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
7 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
8 | setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' | ||
9 | setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' | ||
10 | |||
11 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
12 | |||
13 | setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
14 | setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' | ||
15 | |||
16 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | ||
17 | |||
18 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
19 | setenv update_uboot_it 'setenv module_type -it; run update_uboot' | ||
20 | |||
21 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | ||
22 | |||
23 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' | ||
24 | |||
25 | setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | ||
26 | |||
27 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | ||
28 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | ||
29 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
30 | #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows | ||
31 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
32 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
33 | |||
34 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
35 | setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" | ||
36 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
37 | setenv migrate_it 'setenv module_type -it; run migrate' | ||
38 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' | ||
39 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' | ||
40 | |||
41 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
42 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
43 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
44 | setenv update_it 'setenv module_type -it; run update' | ||
45 | |||
46 | echo 'enter "run update" or "run update_it" to update the entire module' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch deleted file mode 100644 index cf01d59..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 40445299edb425159c30609e1ab7172801535a43 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 14 Sep 2016 10:17:02 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 6 +++--- | ||
8 | flash_eth.scr | 6 +++--- | ||
9 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
12 | index a60a7a5..23c5b72 100644 | ||
13 | --- a/flash_blk.scr | ||
14 | +++ b/flash_blk.scr | ||
15 | @@ -29,13 +29,13 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa | ||
16 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | ||
17 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | ||
18 | |||
19 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
20 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
21 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
22 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
23 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
24 | |||
25 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
26 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
27 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
28 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
29 | |||
30 | -echo 'enter "run update" to update the entire module' | ||
31 | +echo 'enter "run update" to update the uboot' | ||
32 | diff --git a/flash_eth.scr b/flash_eth.scr | ||
33 | index a3906b2..14f4104 100644 | ||
34 | --- a/flash_eth.scr | ||
35 | +++ b/flash_eth.scr | ||
36 | @@ -30,13 +30,13 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt | ||
37 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
38 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
39 | |||
40 | -setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | ||
41 | +setenv echo_migrate echo "successfully updated U-Boot" | ||
42 | setenv migrate 'run migrate_configblock; run update_latest; reset' | ||
43 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | ||
44 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | ||
45 | |||
46 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
47 | -setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
48 | +setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' | ||
49 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | ||
50 | |||
51 | -echo 'enter "run update" to update the entire module' | ||
52 | +echo 'enter "run update" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch index 08ddd88..932f228 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch | |||
@@ -12,25 +12,25 @@ diff --git a/flash_blk.scr b/flash_blk.scr | |||
12 | index cc4cf38..b63366a 100644 | 12 | index cc4cf38..b63366a 100644 |
13 | --- a/flash_blk.scr | 13 | --- a/flash_blk.scr |
14 | +++ b/flash_blk.scr | 14 | +++ b/flash_blk.scr |
15 | @@ -14,6 +14,6 @@ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.i | 15 | @@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-col |
16 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
16 | 17 | ||
17 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | 18 | # Test which version of U-Boot we are currently running on |
18 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | 19 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
19 | -setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | 20 | +setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot; fi' |
20 | +setenv update 'mtdparts default && run update_uboot && reset' | ||
21 | 21 | ||
22 | -echo 'enter "run update" to update the entire module' | 22 | if itest.b *0x30360800 -lt 0x11; then |
23 | +echo 'enter "run update" to update the uboot' | 23 | echo && |
24 | diff --git a/flash_eth.scr b/flash_eth.scr | 24 | diff --git a/flash_eth.scr b/flash_eth.scr |
25 | index 01be124..13025de 100644 | 25 | index 01be124..13025de 100644 |
26 | --- a/flash_eth.scr | 26 | --- a/flash_eth.scr |
27 | +++ b/flash_eth.scr | 27 | +++ b/flash_eth.scr |
28 | @@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write | 28 | @@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board |
29 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | ||
29 | 30 | ||
30 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | 31 | # Test which version of U-Boot we are currently running on |
31 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | 32 | -setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
32 | -setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | 33 | +setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && reset; fi' |
33 | +setenv update 'mtdparts default && run update_uboot && reset' | ||
34 | 34 | ||
35 | -echo 'enter "run update" to update the entire module' | 35 | if itest.b *0x30360800 -lt 0x11; then |
36 | +echo 'enter "run update" to update the uboot' | 36 | echo && |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr index b63366a..f1e73bb 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr | |||
@@ -1,5 +1,5 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | 1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' |
2 | setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' | 2 | setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
@@ -7,13 +7,23 @@ setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' | |||
7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | 7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' |
8 | 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' | 8 | 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' |
9 | 9 | ||
10 | 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' | 10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' |
11 | setenv update_uboot_old '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 && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' | ||
12 | setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' | ||
11 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 13 | setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' |
12 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 14 | setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' |
13 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 15 | setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
14 | 16 | ||
15 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | 17 | # Test which version of U-Boot we are currently running on |
16 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | 18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
17 | setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
18 | 19 | ||
20 | if itest.b *0x30360800 -lt 0x11; then | ||
21 | echo && | ||
22 | echo 'NOTE: The U-Boot provided with this BSP version does not support the' && | ||
23 | echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' && | ||
24 | echo 'update the kernel/device-tree/rootfs manually using: ' && | ||
25 | echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' && | ||
26 | echo && setenv update_uboot; setenv update_uboot_old; setenv update | ||
27 | else | ||
19 | echo 'enter "run update" to update the entire module' | 28 | echo 'enter "run update" to update the entire module' |
29 | fi | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr index 13025de..66cd29d 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr | |||
@@ -1,5 +1,5 @@ | |||
1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' | 1 | setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' |
2 | setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' | 2 | setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' |
3 | 3 | ||
4 | # Migrate to UBI volume based boot schema | 4 | # Migrate to UBI volume based boot schema |
5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' | 5 | setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' |
@@ -7,13 +7,23 @@ setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' | |||
7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' | 7 | setenv prepare_rootfs 'ubi create rootfs 0 dynamic' |
8 | 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' | 8 | 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' |
9 | 9 | ||
10 | 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' | 10 | setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"' |
11 | setenv update_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg' | ||
12 | setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' | ||
11 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' | 13 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' |
12 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' | 14 | setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' |
13 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' | 15 | setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' |
14 | 16 | ||
15 | setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' | 17 | # Test which version of U-Boot we are currently running on |
16 | setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' | 18 | setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi' |
17 | setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' | ||
18 | 19 | ||
20 | if itest.b *0x30360800 -lt 0x11; then | ||
21 | echo && | ||
22 | echo 'NOTE: The U-Boot provided with this BSP version does not support the' && | ||
23 | echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' && | ||
24 | echo 'update the kernel/device-tree/rootfs manually using: ' && | ||
25 | echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' && | ||
26 | echo && setenv update_uboot; setenv update_uboot_old; setenv update | ||
27 | else | ||
19 | echo 'enter "run update" to update the entire module' | 28 | echo 'enter "run update" to update the entire module' |
29 | fi | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..a1e70ba --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | From 25c3ac90c9d0313e4f7d99a68886f8f43d5a0b52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 15 May 2017 14:04:38 +0300 | ||
4 | Subject: [PATCH] Update only u-boot | ||
5 | |||
6 | --- | ||
7 | flash_blk.scr | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/flash_blk.scr b/flash_blk.scr | ||
11 | index ec3e00b..367b910 100644 | ||
12 | --- a/flash_blk.scr | ||
13 | +++ b/flash_blk.scr | ||
14 | @@ -41,7 +41,7 @@ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migr | ||
15 | |||
16 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC | ||
17 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | ||
18 | -setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
19 | +setenv update_latest 'run update_to_spl; run update_uboot' | ||
20 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | ||
21 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | ||
22 | # 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr index 23c5b72..ec3e00b 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr | |||
@@ -1,8 +1,11 @@ | |||
1 | test -n ${interface} || setenv interface mmc | 1 | test -n ${interface} || setenv interface mmc |
2 | test -n ${drive} || setenv drive 1 | 2 | test -n ${drive} || setenv drive 1 |
3 | setenv uboot_hwpart 1 | ||
3 | 4 | ||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | 5 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' |
5 | setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' | 6 | #workaround U-Boot counting in hex and split did in decimal |
7 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | ||
8 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | ||
6 | 9 | ||
7 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | 10 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' |
8 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' | 11 | setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' |
@@ -11,12 +14,14 @@ setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kerne | |||
11 | 14 | ||
12 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | 15 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' |
13 | 16 | ||
14 | setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' | 17 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' |
15 | setenv migrate_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' | 18 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' |
16 | 19 | ||
17 | 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}' | 20 | setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3-${filenum} ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' |
18 | 21 | ||
19 | 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 && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | 22 | setenv update_spl 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 2 ${blkcnt}' |
23 | setenv update_uboot_bin 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 8a ${blkcnt}' | ||
24 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
20 | 25 | ||
21 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | 26 | setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' |
22 | 27 | ||
@@ -27,15 +32,19 @@ setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 $ | |||
27 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | 32 | setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' |
28 | setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | 33 | setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' |
29 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | 34 | #do it in chunks of 64M to fit into DDR RAM of the smallest module |
30 | setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' | 35 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' |
31 | 36 | ||
32 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | 37 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" |
33 | setenv migrate 'run migrate_configblock; run update_latest; reset' | 38 | setenv migrate 'run migrate_configblock; run update_latest; reset' |
34 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | 39 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' |
35 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | 40 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' |
36 | 41 | ||
37 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | 42 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC |
43 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | ||
44 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
45 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | ||
38 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | 46 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' |
47 | # 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed | ||
39 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | 48 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' |
40 | 49 | ||
41 | echo 'enter "run update" to update the entire module' | 50 | echo 'enter "run update" to update the entire module' |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr index 14f4104..77e2ac9 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr | |||
@@ -1,6 +1,8 @@ | |||
1 | setenv uboot_hwpart 1 | ||
2 | |||
1 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | 3 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' |
2 | #workaround U-Boot counting in hex and split did in decimal | 4 | #workaround U-Boot counting in hex and split did in decimal |
3 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' | 5 | setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true' |
4 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' | 6 | setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' |
5 | 7 | ||
6 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' | 8 | setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' |
@@ -10,12 +12,14 @@ setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kerne | |||
10 | 12 | ||
11 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' | 13 | setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' |
12 | 14 | ||
13 | setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' | 15 | setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1' |
14 | setenv migrate_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' | 16 | setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' |
15 | 17 | ||
16 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' | 18 | setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' |
17 | 19 | ||
18 | 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 && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | 20 | setenv update_spl 'tftpboot ${loadaddr} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 2 ${blkcnt}' |
21 | setenv update_uboot_bin 'tftpboot ${loadaddr} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${loadaddr} 8a ${blkcnt}' | ||
22 | setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' | ||
19 | 23 | ||
20 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' | 24 | setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' |
21 | 25 | ||
@@ -26,17 +30,19 @@ setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_n | |||
26 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' | 30 | setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' |
27 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' | 31 | setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' |
28 | #do it in chunks of 64M to fit into DDR RAM of the smallest module | 32 | #do it in chunks of 64M to fit into DDR RAM of the smallest module |
29 | #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows | 33 | setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' |
30 | #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- | ||
31 | setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' | ||
32 | 34 | ||
33 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" | 35 | setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" |
34 | setenv migrate 'run migrate_configblock; run update_latest; reset' | 36 | setenv migrate 'run migrate_configblock; run update_latest; reset' |
35 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' | 37 | setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' |
36 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' | 38 | setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' |
37 | 39 | ||
38 | setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | 40 | # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC |
41 | setenv update_to_spl 'mmc dev 0 1; mmc read $loadaddr 8a 1; itest.l *12000000 -ne 56190527 && run update_spl' | ||
42 | setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' | ||
43 | # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed | ||
39 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' | 44 | setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' |
45 | # 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed | ||
40 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' | 46 | setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' |
41 | 47 | ||
42 | echo 'enter "run update" to update the entire module' | 48 | echo 'enter "run update" to update the entire module' |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr deleted file mode 100644 index 3e05a85..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | test -n ${interface} || setenv interface mmc | ||
2 | test -n ${drive} || setenv drive 0 | ||
3 | |||
4 | setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' | ||
5 | setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' | ||
6 | echo 'enter "run update_uboot" to update the uboot' | ||
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr deleted file mode 100644 index 0c16652..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #flash_mmc has been renamed to flash_blk, ensure compatibility when updating from older versions | ||
2 | test -n ${interface} || setenv interface mmc | ||
3 | test -n ${drive} || setenv drive 0 | ||
4 | |||
5 | fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img | ||
6 | source ${loadaddr} | ||