summaryrefslogtreecommitdiffstats
path: root/meta-fsl-extras
diff options
context:
space:
mode:
Diffstat (limited to 'meta-fsl-extras')
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb33
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch60
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr45
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr46
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch52
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr41
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr42
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch36
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr19
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr19
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch62
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr28
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr28
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr11
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr6
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr3
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr6
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr6
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr2
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr3
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch86
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch47
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch12
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch25
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch14
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend23
26 files changed, 611 insertions, 144 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
index bb209ad..b5d96b6 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
@@ -31,11 +31,15 @@ LICENSE = "The-Qt-Company-DCLA-2.1"
31LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" 31LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
32DEPENDS = "u-boot-mkimage-native" 32DEPENDS = "u-boot-mkimage-native"
33 33
34PV = "v2.3" 34PV = "v2.6"
35 35
36SRC_URI = " \ 36SRC_URI = " \
37 file://flash_mmc.scr \ 37 file://fwd_mmc.scr \
38 file://fwd_blk.scr \
39 file://fwd_eth.scr \
38 file://flash_blk.scr \ 40 file://flash_blk.scr \
41 file://flash_eth.scr \
42 file://0001-Update-only-u-boot.patch \
39 " 43 "
40 44
41S = "${WORKDIR}" 45S = "${WORKDIR}"
@@ -43,27 +47,20 @@ S = "${WORKDIR}"
43inherit deploy 47inherit deploy
44 48
45do_mkimage () { 49do_mkimage () {
46 uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ 50 for scr in ${WORKDIR}/*.scr; do
47 -n "update script" -d ${WORKDIR}/flash_mmc.scr \ 51 uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
48 flash_mmc.img 52 -n "update script" -d ${scr} \
49 53 $(basename ${scr} .scr).img
50 uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ 54 done
51 -n "update script" -d ${WORKDIR}/flash_blk.scr \
52 flash_blk.img
53} 55}
54 56
55addtask mkimage after do_compile before do_install 57addtask mkimage after do_compile before do_install
56 58
57do_deploy () { 59do_deploy () {
58 install -d ${DEPLOYDIR} 60 install -d ${DEPLOYDIR}/${MACHINE}
59 install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img 61 install -m 0644 -t ${DEPLOYDIR} ${S}/*.img
60 install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img 62 ln -s ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/
61 63 ln -s ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/
62 cd ${DEPLOYDIR}
63 rm -f flash_mmc-${MACHINE}.img
64 ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img
65 rm -f flash_blk-${MACHINE}.img
66 ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img
67} 64}
68 65
69addtask deploy after do_install before do_build 66addtask deploy after do_install before do_build
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
new file mode 100644
index 0000000..5c62eb1
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch
@@ -0,0 +1,60 @@
1From 262b1dcc5f886ceb1944c8db3c1072c98d45a56e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 14 Sep 2016 10:11:32 +0300
4Subject: [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
11diff --git a/flash_blk.scr b/flash_blk.scr
12index 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'
36diff --git a/flash_eth.scr b/flash_eth.scr
37index 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
new file mode 100644
index 0000000..398c4de
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr
@@ -0,0 +1,45 @@
1test -n ${interface} || setenv interface mmc
2test -n ${drive} || setenv drive 1
3
4setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
5setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}'
6
7setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
8setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
9setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
10setenv 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
12setenv 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
14setenv 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}'
15setenv 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
17setenv 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
19setenv 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'
20setenv update_uboot_it 'setenv module_type -it; run update_uboot'
21
22setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
23
24setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
25
26setenv 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
28setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
29setenv 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
31setenv 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
33setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
34setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
35setenv migrate 'run migrate_configblock; run update_latest; reset'
36setenv migrate_it 'setenv module_type -it; run migrate'
37setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
38setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
39
40setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
41setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
42setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
43setenv update_it 'setenv module_type -it; run update'
44
45echo '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
new file mode 100644
index 0000000..2f64288
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr
@@ -0,0 +1,46 @@
1setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
2#workaround U-Boot counting in hex and split did in decimal
3setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
4setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
5
6setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
7setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
8setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
9setenv 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
11setenv 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
13setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}'
14setenv 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
16setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
17
18setenv 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'
19setenv update_uboot_it 'setenv module_type -it; run update_uboot'
20
21setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
22
23setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
24
25setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1'
26
27setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
28setenv 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-
32setenv 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
34setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
35setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
36setenv migrate 'run migrate_configblock; run update_latest; reset'
37setenv migrate_it 'setenv module_type -it; run migrate'
38setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
39setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
40
41setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
42setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
43setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
44setenv update_it 'setenv module_type -it; run update'
45
46echo '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
new file mode 100644
index 0000000..cf01d59
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch
@@ -0,0 +1,52 @@
1From 40445299edb425159c30609e1ab7172801535a43 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 14 Sep 2016 10:17:02 +0300
4Subject: [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
11diff --git a/flash_blk.scr b/flash_blk.scr
12index 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'
32diff --git a/flash_eth.scr b/flash_eth.scr
33index 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-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr
new file mode 100644
index 0000000..23c5b72
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr
@@ -0,0 +1,41 @@
1test -n ${interface} || setenv interface mmc
2test -n ${drive} || setenv drive 1
3
4setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
5setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}'
6
7setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
8setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
9setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
10setenv 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
12setenv 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
14setenv 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'
15setenv 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'
16
17setenv 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
19setenv 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'
20
21setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
22
23setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
24
25setenv 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'
26
27setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
28setenv 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
30setenv 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'
31
32setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
33setenv migrate 'run migrate_configblock; run update_latest; reset'
34setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
35setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
36
37setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
38setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
39setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
40
41echo '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/colibri-imx6/flash_eth.scr
new file mode 100644
index 0000000..14f4104
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr
@@ -0,0 +1,42 @@
1setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
2#workaround U-Boot counting in hex and split did in decimal
3setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
4setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
5
6setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
7setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
8setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
9setenv 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
11setenv 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
13setenv 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'
14setenv 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'
15
16setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
17
18setenv 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'
19
20setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
21
22setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
23
24setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1'
25
26setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
27setenv 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
29#split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows
30#split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3-
31setenv 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
33setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
34setenv migrate 'run migrate_configblock; run update_latest; reset'
35setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
36setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
37
38setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
39setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
40setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
41
42echo 'enter "run update" to update the entire module'
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
new file mode 100644
index 0000000..08ddd88
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
@@ -0,0 +1,36 @@
1From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 14 Sep 2016 10:19:28 +0300
4Subject: [PATCH] Update only u-boot
5
6---
7 flash_blk.scr | 4 ++--
8 flash_eth.scr | 4 ++--
9 2 files changed, 4 insertions(+), 4 deletions(-)
10
11diff --git a/flash_blk.scr b/flash_blk.scr
12index cc4cf38..b63366a 100644
13--- a/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
16
17 setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
18 setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && 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 && run update_uboot && reset'
21
22-echo 'enter "run update" to update the entire module'
23+echo 'enter "run update" to update the uboot'
24diff --git a/flash_eth.scr b/flash_eth.scr
25index 01be124..13025de 100644
26--- a/flash_eth.scr
27+++ b/flash_eth.scr
28@@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write
29
30 setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
31 setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && 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 && run update_uboot && reset'
34
35-echo 'enter "run update" to update the entire module'
36+echo 'enter "run update" to update the uboot'
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
new file mode 100644
index 0000000..b63366a
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
@@ -0,0 +1,19 @@
1setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
2setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}'
3
4# Migrate to UBI volume based boot schema
5setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
6setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
7setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
8setenv 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
10setenv 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'
11setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
12setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
13setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
14
15setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
16setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
17setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
18
19echo 'enter "run update" to update the entire module'
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
new file mode 100644
index 0000000..13025de
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
@@ -0,0 +1,19 @@
1setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
2setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}'
3
4# Migrate to UBI volume based boot schema
5setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
6setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
7setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
8setenv 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
10setenv 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'
11setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
12setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
13setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
14
15setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
16setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
17setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
18
19echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
new file mode 100644
index 0000000..f096c2e
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
@@ -0,0 +1,62 @@
1From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 14 Sep 2016 10:22:27 +0300
4Subject: [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
11diff --git a/flash_blk.scr b/flash_blk.scr
12index 401c47a..8fa5af9 100644
13--- a/flash_blk.scr
14+++ b/flash_blk.scr
15@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage
16 setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
17 setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
18
19-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
20+setenv update_new 'run update_uboot; reset'
21
22 # Upgrade part 1, write new U-Boot, but with old ECC format still...
23 # Store config block temporarly in memory at kernel_addr_r.
24@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
25 setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
26
27 # Upgrade part 2, use new ECC format for the whole device...
28-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
29+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
30 setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
31
32 # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
33 setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
34
35-echo 'enter "run update" to update the entire module'
36+echo 'enter "run update" to update the uboot'
37diff --git a/flash_eth.scr b/flash_eth.scr
38index 15aab1c..aa98b3a 100644
39--- a/flash_eth.scr
40+++ b/flash_eth.scr
41@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${l
42 setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
43 setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
44
45-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
46+setenv update_new 'run update_uboot; reset'
47
48 # Upgrade part 1, write new U-Boot, but with old ECC format still...
49 # Store config block temporarly in memory at kernel_addr_r.
50@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
51 setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
52
53 # Upgrade part 2, use new ECC format for the whole device...
54-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
55+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
56 setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
57
58 # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
59 setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
60
61-echo 'enter "run update" to update the entire module'
62+echo 'enter "run update" to update the uboot'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
new file mode 100644
index 0000000..8fa5af9
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
@@ -0,0 +1,28 @@
1setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
2setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}'
3
4# Migrate to UBI volume based boot schema
5setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
6setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
7setenv 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_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
8
9setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot'
10setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
11setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
12setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
13
14setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
15
16# Upgrade part 1, write new U-Boot, but with old ECC format still...
17# Store config block temporarly in memory at kernel_addr_r.
18setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
19setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
20
21# Upgrade part 2, use new ECC format for the whole device...
22setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
23setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
24
25# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
26setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
27
28echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
new file mode 100644
index 0000000..aa98b3a
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
@@ -0,0 +1,28 @@
1setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
2setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}'
3
4# Migrate to UBI volume based boot schema
5setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
6setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
7setenv 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_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
8
9setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot'
10setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
11setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
12setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
13
14setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
15
16# Upgrade part 1, write new U-Boot, but with old ECC format still...
17# Store config block temporarly in memory at kernel_addr_r.
18setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
19setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
20
21# Upgrade part 2, use new ECC format for the whole device...
22setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
23setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
24
25# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
26setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
27
28echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr
new file mode 100644
index 0000000..7af72e6
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr
@@ -0,0 +1,11 @@
1#the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img
2test -n ${interface} || setenv interface mmc
3test -n ${drive} || setenv drive 1
4test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
5test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
6test "${board_name}" = "colibri_imx7" && setenv drive 0
7test "${board_name}" = "colibri_t20" && setenv drive 0
8test "${board_name}" = "colibri_vf" && setenv drive 0
9
10test -n ${board_name} || echo "board_name env not set!" && exit
11fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr
new file mode 100644
index 0000000..d7ea35c
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr
@@ -0,0 +1,6 @@
1#the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img
2test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
3test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
4
5test -n ${board_name} || echo "board_name env not set!" && exit
6tftpboot ${loadaddr} "${board_name}/flash_eth.img" && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr
new file mode 100644
index 0000000..4c8f666
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr
@@ -0,0 +1,3 @@
1#the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img
2#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions
3fatload mmc ${drive}:1 ${loadaddr} flash_blk.img && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
deleted file mode 100644
index ee87e85..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
+++ /dev/null
@@ -1,6 +0,0 @@
1test -n ${interface} || setenv interface mmc
2test -n ${drive} || setenv drive 1
3
4setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
5setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}'
6echo 'enter "run update_uboot" to update the uboot'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
deleted file mode 100644
index 207c7db..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
+++ /dev/null
@@ -1,6 +0,0 @@
1#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions
2test -n ${interface} || setenv interface mmc
3test -n ${drive} || setenv drive 1
4
5fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img
6source ${loadaddr}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
deleted file mode 100644
index be8ec8d..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
+++ /dev/null
@@ -1,2 +0,0 @@
1setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot'
2echo 'enter "run update_uboot" to update the uboot'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
deleted file mode 100644
index e0770a0..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
+++ /dev/null
@@ -1,3 +0,0 @@
1setenv interface mmc
2fatload ${interface} 0:1 ${loadaddr} flash_blk.img
3source ${loadaddr}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
new file mode 100644
index 0000000..135dfd8
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
@@ -0,0 +1,86 @@
1From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 14 Sep 2016 17:10:22 +0300
4Subject: [PATCH] Make sdboot default on all boards
5
6---
7 include/configs/apalis_imx6.h | 13 +++++++------
8 include/configs/colibri_imx6.h | 3 ++-
9 include/configs/colibri_imx7.h | 2 +-
10 include/configs/colibri_vf.h | 2 +-
11 4 files changed, 11 insertions(+), 9 deletions(-)
12
13diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
14index 3ea4a5c..53d9a0c 100644
15--- a/include/configs/apalis_imx6.h
16+++ b/include/configs/apalis_imx6.h
17@@ -252,14 +252,14 @@
18 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
19
20 #define SD_BOOTCMD \
21- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
22- "rootwait\0" \
23+ "drive=2\0" \
24 "sdboot=run setup; " \
25- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
26+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
27+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
28 "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
29- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
30+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
31 "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
32- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
33+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
34 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
35
36 #define USB_BOOTCMD \
37@@ -279,7 +279,8 @@
38 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
39 #endif
40 #define CONFIG_EXTRA_ENV_SETTINGS \
41- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
42+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
43+ "run emmcboot ; echo ; echo emmcboot failed ; " \
44 "run nfsboot ; echo ; echo nfsboot failed ; " \
45 "usb start ;" \
46 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
47diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
48index adc2d1e..9fd5f4c 100644
49--- a/include/configs/colibri_imx6.h
50+++ b/include/configs/colibri_imx6.h
51@@ -245,7 +245,8 @@
52
53 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
54 #define CONFIG_EXTRA_ENV_SETTINGS \
55- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
56+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
57+ "run emmcboot ; echo ; echo emmcboot failed ; " \
58 "run nfsboot ; echo ; echo nfsboot failed ; " \
59 "usb start ;" \
60 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
61diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
62index e585c81..f6267a7 100644
63--- a/include/configs/colibri_imx7.h
64+++ b/include/configs/colibri_imx7.h
65@@ -226,7 +226,7 @@
66 "ubi read ${fdt_addr_r} dtb && " \
67 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
68
69-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
70+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
71
72 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
73
74diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
75index 26cf60a..33a3e3b 100644
76--- a/include/configs/colibri_vf.h
77+++ b/include/configs/colibri_vf.h
78@@ -185,7 +185,7 @@
79 "ubi read ${fdt_addr_r} dtb && " \
80 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
81
82-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
83+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
84
85 #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
86
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
deleted file mode 100644
index 5a456c5..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 4569a8b4997340aae34365f2f896b842f8cc114b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Mon, 27 Oct 2014 14:53:25 +0200
4Subject: [PATCH] Update default args for apalis imx6
5
6Boot from sd card by default
7---
8 include/configs/apalis_imx6.h | 13 +++++++------
9 1 file changed, 7 insertions(+), 6 deletions(-)
10
11diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
12index 3ea4a5c..53d9a0c 100644
13--- a/include/configs/apalis_imx6.h
14+++ b/include/configs/apalis_imx6.h
15@@ -252,14 +252,14 @@
16 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
17
18 #define SD_BOOTCMD \
19- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
20- "rootwait\0" \
21+ "drive=2\0" \
22 "sdboot=run setup; " \
23- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
24+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
25+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
26 "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
27- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
28+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
29 "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
30- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
31+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
32 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
33
34 #define USB_BOOTCMD \
35@@ -279,7 +279,8 @@
36 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
37 #endif
38 #define CONFIG_EXTRA_ENV_SETTINGS \
39- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
40+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
41+ "run emmcboot ; echo ; echo emmcboot failed ; " \
42 "run nfsboot ; echo ; echo nfsboot failed ; " \
43 "usb start ;" \
44 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
45--
461.9.1
47
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
deleted file mode 100644
index 501ad33..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h
2--- git.orig/include/configs/colibri_imx7.h 2016-07-15 12:31:35.915934824 +0300
3+++ git/include/configs/colibri_imx7.h 2016-07-15 12:32:40.867937388 +0300
4@@ -248,7 +248,7 @@
5 "${board}/flash_eth.img && source ${loadaddr}\0" \
6 "setsdupdate=mmc rescan && setenv interface mmc && " \
7 "fatload ${interface} 0:1 ${loadaddr} " \
8- "${board}/flash_blk.img && source ${loadaddr}\0" \
9+ "/flash_blk.img && source ${loadaddr}\0" \
10 "setup=setenv setupargs " \
11 "console=tty1 console=${console}" \
12 ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
deleted file mode 100644
index b54a4ae..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f480a948551b0e5592d93cb7a5dc1653de900909 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 24 Feb 2016 16:01:33 +0200
4Subject: [PATCH] colibri vf: remove console from tty1
5
6---
7 include/configs/colibri_vf.h | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
11index b870812..0726fc5 100644
12--- a/include/configs/colibri_vf.h
13+++ b/include/configs/colibri_vf.h
14@@ -202,7 +202,7 @@
15 "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
16 "source ${loadaddr}\0" \
17 "setup=setenv setupargs " \
18- "console=tty1 console=${console}" \
19+ "console=${console}" \
20 ",${baudrate}n8 ${memargs} consoleblank=0\0" \
21 "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
22 "setusbupdate=usb start && setenv interface usb && " \
23--
241.9.1
25
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
deleted file mode 100644
index 25476dd..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h
2--- git.orig/include/configs/colibri_vf.h 2016-07-15 12:05:41.263873456 +0300
3+++ git/include/configs/colibri_vf.h 2016-07-15 12:06:19.759874976 +0300
4@@ -161,8 +161,8 @@
5 "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \
6 "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
7 "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
8- "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
9- "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
10+ "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \
11+ "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \
12 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
13
14 #define NFS_BOOTCMD \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
index cb94605..9f98fc3 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
@@ -27,17 +27,18 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30PV = "v2015.04-v2.6b2.1+git${SRCPV}"
31SRCREV_b2qt = "90a974d34aaa85d5ce69f83067928592c5389990"
32SRCBRANCH = "2015.04-toradex"
33COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
34
35do_deploy_append_apalis-imx6() {
36 cd ${DEPLOYDIR}
37 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type}
38 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type}
39}
40
30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 41FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31SRC_URI += " \ 42SRC_URI += " \
32 file://0001-colibri-vf-remove-console-from-tty1.patch \ 43 file://0001-Make-sdboot-default-on-all-boards.patch \
33 file://0002-colibri-vf-fix-mmc-boot.patch \
34 file://0001-Update-default-args-for-apalis-imx6.patch \
35 file://0001-colibri-imx7-fix-update-u-boot.patch \
36 " 44 "
37
38do_compile_append () {
39 if [ "${MACHINE}" = "colibri-vf" ]; then
40 oe_runmake u-boot-nand.imx
41 fi
42
43}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 22:21:29 +0000