Merge remote-tracking branch 'origin/jethro' into merge

* origin/jethro:
  Rename last references to b2qt-utils
  Rename b2qt-utils to qtdeviceutilities
  toradex: apply u-boot and flashing script changes to colibri-imx7
  nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
  qt5: update submodules
  toradex: use latest u-boot and flashing scripts
  kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
  Use code.qt.io with git protocol instead of codereview
  Use new repo url for utils and appcontroller
  kontron: patch kernel to support newer vivante drivers
  Fetch only external repos for repo mirror
  qt5: update submodules
  Add rsync to image
  Fix raspberry3 build error in perl deployment
  rcar-gen2: USB fixups
  ostree: Added dependency for systemd
  qtquickcompiler: update revision
  qtquickcompiler: update revision
  Fix typo in RPi overlay config
  Update meta layers

Conflicts:
	conf/distro/include/toradex.inc
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
	meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
	recipes/ostree/ostree.bb
	recipes/samba/samba_4.1.12.bbappend
	scripts/manifest_jethro.xml

Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848

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"
 LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 DEPENDS = "u-boot-mkimage-native"
 
-PV = "v2.3"
+PV = "v2.6"
 
 SRC_URI = " \
-    file://flash_mmc.scr \
+    file://fwd_mmc.scr \
+    file://fwd_blk.scr \
+    file://fwd_eth.scr \
     file://flash_blk.scr \
+    file://flash_eth.scr \
+    file://0001-Update-only-u-boot.patch \
     "
 
 S = "${WORKDIR}"
@@ -43,27 +47,20 @@ S = "${WORKDIR}"
 inherit deploy
 
 do_mkimage () {
-    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-                  -n "update script" -d ${WORKDIR}/flash_mmc.scr \
-                  flash_mmc.img
-
-    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-                  -n "update script" -d ${WORKDIR}/flash_blk.scr \
-                  flash_blk.img
+    for scr in ${WORKDIR}/*.scr; do
+        uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+                  -n "update script" -d ${scr} \
+                  $(basename ${scr} .scr).img
+    done
 }
 
 addtask mkimage after do_compile before do_install
 
 do_deploy () {
-    install -d ${DEPLOYDIR}
-    install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img
-    install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img
-
-    cd ${DEPLOYDIR}
-    rm -f flash_mmc-${MACHINE}.img
-    ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img
-    rm -f flash_blk-${MACHINE}.img
-    ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img
+    install -d ${DEPLOYDIR}/${MACHINE}
+    install -m 0644 -t ${DEPLOYDIR} ${S}/*.img
+    ln -s ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/
+    ln -s ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/
 }
 
 addtask 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 @@
+From 262b1dcc5f886ceb1944c8db3c1072c98d45a56e Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 10:11:32 +0300
+Subject: [PATCH] Update only u-boot
+
+---
+ flash_blk.scr        | 8 ++++----
+ flash_eth.scr        | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/flash_blk.scr b/flash_blk.scr
+index 800383c..398c4de 100644
+--- a/flash_blk.scr
++++ b/flash_blk.scr
+@@ -30,16 +30,16 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa
+ #do it in chunks of 64M to fit into DDR RAM of the smallest module
+ 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'
+ 
+-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+-setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
++setenv echo_migrate echo "successfully updated U-Boot"
++setenv echo_migrate-it echo "successfully updated U-Boot"
+ setenv migrate 'run migrate_configblock; run update_latest; reset'
+ setenv migrate_it 'setenv module_type -it; run migrate'
+ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
+ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
+ 
+ setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3'
+ setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+ setenv update_it 'setenv module_type -it; run update'
+ 
+-echo 'enter "run update" or "run update_it" to update the entire module'
++echo 'enter "run update" or "run update_it" to update the uboot'
+diff --git a/flash_eth.scr b/flash_eth.scr
+index 804c924..2f64288 100644
+--- a/flash_eth.scr
++++ b/flash_eth.scr
+@@ -31,16 +31,16 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt
+ #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3-
+ 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'
+ 
+-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+-setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
++setenv echo_migrate echo "successfully updated U-Boot"
++setenv echo_migrate-it echo "successfully updated U-Boot"
+ setenv migrate 'run migrate_configblock; run update_latest; reset'
+ setenv migrate_it 'setenv module_type -it; run migrate'
+ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
+ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
+ 
+ setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3'
+ setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+ setenv update_it 'setenv module_type -it; run update'
+ 
+-echo 'enter "run update" or "run update_it" to update the entire module'
++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 @@
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 1
+
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}'
+
+setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+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'
+
+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'
+
+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}'
+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'
+
+setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
+
+setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${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'
+setenv update_uboot_it 'setenv module_type -it; run update_uboot'
+
+setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
+
+setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
+
+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'
+
+setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
+setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}'
+#do it in chunks of 64M to fit into DDR RAM of the smallest module
+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'
+
+setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
+setenv migrate 'run migrate_configblock; run update_latest; reset'
+setenv migrate_it 'setenv module_type -it; run migrate'
+setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
+setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
+
+setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
+setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+setenv update_it 'setenv module_type -it; run update'
+
+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
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 @@
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+#workaround U-Boot counting in hex and split did in decimal
+setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
+setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
+
+setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+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'
+
+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'
+
+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}'
+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'
+
+setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
+
+setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${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'
+setenv update_uboot_it 'setenv module_type -it; run update_uboot'
+
+setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
+
+setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
+
+setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1'
+
+setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
+setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}'
+#do it in chunks of 64M to fit into DDR RAM of the smallest module
+#split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows
+#split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3-
+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'
+
+setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update"
+setenv migrate 'run migrate_configblock; run update_latest; reset'
+setenv migrate_it 'setenv module_type -it; run migrate'
+setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}'
+setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}'
+
+setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
+setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+setenv update_it 'setenv module_type -it; run update'
+
+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
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 @@
+From 40445299edb425159c30609e1ab7172801535a43 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 10:17:02 +0300
+Subject: [PATCH] Update only u-boot
+
+---
+ flash_blk.scr | 6 +++---
+ flash_eth.scr | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/flash_blk.scr b/flash_blk.scr
+index a60a7a5..23c5b72 100644
+--- a/flash_blk.scr
++++ b/flash_blk.scr
+@@ -29,13 +29,13 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa
+ #do it in chunks of 64M to fit into DDR RAM of the smallest module
+ 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'
+ 
+-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
++setenv echo_migrate echo "successfully updated U-Boot"
+ setenv migrate 'run migrate_configblock; run update_latest; reset'
+ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
+ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
+ 
+ setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3'
+ setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+ 
+-echo 'enter "run update" to update the entire module'
++echo 'enter "run update" to update the uboot'
+diff --git a/flash_eth.scr b/flash_eth.scr
+index a3906b2..14f4104 100644
+--- a/flash_eth.scr
++++ b/flash_eth.scr
+@@ -30,13 +30,13 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt
+ #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3-
+ 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'
+ 
+-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
++setenv echo_migrate echo "successfully updated U-Boot"
+ setenv migrate 'run migrate_configblock; run update_latest; reset'
+ setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
+ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
+ 
+ setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3'
+ setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+ 
+-echo 'enter "run update" to update the entire module'
++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 @@
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 1
+
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}'
+
+setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+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'
+
+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'
+
+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'
+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'
+
+setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
+
+setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
+
+setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
+
+setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
+
+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'
+
+setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
+setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}'
+#do it in chunks of 64M to fit into DDR RAM of the smallest module
+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'
+
+setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+setenv migrate 'run migrate_configblock; run update_latest; reset'
+setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
+setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
+
+setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
+setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+
+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/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 @@
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+#workaround U-Boot counting in hex and split did in decimal
+setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
+setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
+
+setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1'
+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'
+
+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'
+
+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'
+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'
+
+setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}'
+
+setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
+
+setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}'
+
+setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}'
+
+setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1'
+
+setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1'
+setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}'
+#do it in chunks of 64M to fit into DDR RAM of the smallest module
+#split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows
+#split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3-
+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'
+
+setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
+setenv migrate 'run migrate_configblock; run update_latest; reset'
+setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
+setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
+
+setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
+setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
+setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
+
+echo '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 @@
+From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 10:19:28 +0300
+Subject: [PATCH] Update only u-boot
+
+---
+ flash_blk.scr   | 4 ++--
+ flash_eth.scr   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/flash_blk.scr b/flash_blk.scr
+index cc4cf38..b63366a 100644
+--- a/flash_blk.scr
++++ b/flash_blk.scr
+@@ -14,6 +14,6 @@ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.i
+ 
+ setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+ setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
++setenv update 'mtdparts default && run update_uboot && reset'
+ 
+-echo 'enter "run update" to update the entire module'
++echo 'enter "run update" to update the uboot'
+diff --git a/flash_eth.scr b/flash_eth.scr
+index 01be124..13025de 100644
+--- a/flash_eth.scr
++++ b/flash_eth.scr
+@@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write
+ 
+ setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+ setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
++setenv update 'mtdparts default && run update_uboot && reset'
+ 
+-echo 'enter "run update" to update the entire module'
++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 @@
+setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
+setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}'
+
+# Migrate to UBI volume based boot schema
+setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
+setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
+setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
+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'
+
+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'
+setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
+setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+
+setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
+
+echo '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 @@
+setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
+setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}'
+
+# Migrate to UBI volume based boot schema
+setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
+setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
+setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
+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'
+
+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'
+setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
+setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+
+setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
+
+echo '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 @@
+From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 10:22:27 +0300
+Subject: [PATCH] Update only u-boot
+
+---
+ flash_blk.scr   | 6 +++---
+ flash_eth.scr   | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/flash_blk.scr b/flash_blk.scr
+index 401c47a..8fa5af9 100644
+--- a/flash_blk.scr
++++ b/flash_blk.scr
+@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage
+ setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+ 
+-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
++setenv update_new 'run update_uboot; reset'
+ 
+ # Upgrade part 1, write new U-Boot, but with old ECC format still...
+ # Store config block temporarly in memory at kernel_addr_r.
+@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+ 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.'
+ 
+ # Upgrade part 2, use new ECC format for the whole device...
+-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}'
++setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
+ setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
+ 
+ # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
+ setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
+ 
+-echo 'enter "run update" to update the entire module'
++echo 'enter "run update" to update the uboot'
+diff --git a/flash_eth.scr b/flash_eth.scr
+index 15aab1c..aa98b3a 100644
+--- a/flash_eth.scr
++++ b/flash_eth.scr
+@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${l
+ setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+ 
+-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
++setenv update_new 'run update_uboot; reset'
+ 
+ # Upgrade part 1, write new U-Boot, but with old ECC format still...
+ # Store config block temporarly in memory at kernel_addr_r.
+@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+ 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.'
+ 
+ # Upgrade part 2, use new ECC format for the whole device...
+-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}'
++setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
+ setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
+ 
+ # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
+ setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
+ 
+-echo 'enter "run update" to update the entire module'
++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 @@
+setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
+setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}'
+
+# Migrate to UBI volume based boot schema
+setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
+setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
+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_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
+
+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 && nand write ${loadaddr} u-boot'
+setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
+setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+
+setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
+
+# Upgrade part 1, write new U-Boot, but with old ECC format still...
+# Store config block temporarly in memory at kernel_addr_r.
+setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
+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.'
+
+# Upgrade part 2, use new ECC format for the whole device...
+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}'
+setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
+
+# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
+setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
+
+echo '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 @@
+setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
+setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}'
+
+# Migrate to UBI volume based boot schema
+setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
+setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
+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_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
+
+setenv 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'
+setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}'
+setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}'
+setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}'
+
+setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
+
+# Upgrade part 1, write new U-Boot, but with old ECC format still...
+# Store config block temporarly in memory at kernel_addr_r.
+setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
+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.'
+
+# Upgrade part 2, use new ECC format for the whole device...
+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}'
+setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
+
+# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
+setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
+
+echo '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 @@
+#the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 1
+test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
+test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
+test "${board_name}" = "colibri_imx7" && setenv drive 0
+test "${board_name}" = "colibri_t20" && setenv drive 0
+test "${board_name}" = "colibri_vf" && setenv drive 0
+
+test -n ${board_name} || echo "board_name env not set!" && exit
+fatload ${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 @@
+#the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img
+test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
+test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
+
+test -n ${board_name} || echo "board_name env not set!" && exit
+tftpboot ${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 @@
+#the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img
+#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions
+fatload 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 @@
-test -n ${interface} || setenv interface mmc
-test -n ${drive} || setenv drive 1
-
-setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
-setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}'
-echo '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 @@
-#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions
-test -n ${interface} || setenv interface mmc
-test -n ${drive} || setenv drive 1
-
-fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img
-source ${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 @@
-setenv 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'
-echo '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 @@
-setenv interface mmc
-fatload ${interface} 0:1 ${loadaddr} flash_blk.img
-source ${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 @@
+From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 17:10:22 +0300
+Subject: [PATCH] Make sdboot default on all boards
+
+---
+ include/configs/apalis_imx6.h  | 13 +++++++------
+ include/configs/colibri_imx6.h |  3 ++-
+ include/configs/colibri_imx7.h |  2 +-
+ include/configs/colibri_vf.h   |  2 +-
+ 4 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
+index 3ea4a5c..53d9a0c 100644
+--- a/include/configs/apalis_imx6.h
++++ b/include/configs/apalis_imx6.h
+@@ -252,14 +252,14 @@
+                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ 
+ #define SD_BOOTCMD                                             \
+-       "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
+-               "rootwait\0" \
++       "drive=2\0" \
+        "sdboot=run setup; " \
+-               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
++               "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
++               "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
+                "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
+-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
++               "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
+                "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
+-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
++       "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
+                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ 
+ #define USB_BOOTCMD \
+@@ -279,7 +279,8 @@
+ #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
+ #endif
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
++       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
++               "run emmcboot ; echo ; echo emmcboot failed ; " \
+                "run nfsboot ; echo ; echo nfsboot failed ; " \
+                "usb start ;" \
+                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
+index adc2d1e..9fd5f4c 100644
+--- a/include/configs/colibri_imx6.h
++++ b/include/configs/colibri_imx6.h
+@@ -245,7 +245,8 @@
+ 
+ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
++       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
++        "run emmcboot ; echo ; echo emmcboot failed ; " \
+                "run nfsboot ; echo ; echo nfsboot failed ; " \
+                "usb start ;" \
+                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
+index e585c81..f6267a7 100644
+--- a/include/configs/colibri_imx7.h
++++ b/include/configs/colibri_imx7.h
+@@ -226,7 +226,7 @@
+                "ubi read ${fdt_addr_r} dtb && " \
+                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ 
+-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
+ 
+ #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
+ 
+diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
+index 26cf60a..33a3e3b 100644
+--- a/include/configs/colibri_vf.h
++++ b/include/configs/colibri_vf.h
+@@ -185,7 +185,7 @@
+        "ubi read ${fdt_addr_r} dtb && " \
+        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ 
+-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
+ 
+ #define DFU_ALT_NAND_INFO      "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
+ 
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 @@
-From 4569a8b4997340aae34365f2f896b842f8cc114b Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Mon, 27 Oct 2014 14:53:25 +0200
-Subject: [PATCH] Update default args for apalis imx6
-
-Boot from sd card by default
----
- include/configs/apalis_imx6.h | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 3ea4a5c..53d9a0c 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -252,14 +252,14 @@
-                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
- 
- #define SD_BOOTCMD                                             \
--       "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
--               "rootwait\0" \
-+       "drive=2\0" \
-        "sdboot=run setup; " \
--               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-+               "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \
-+               "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \
-                "${vidargs}; echo Booting from SD card in 8-bit slot...; " \
--               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-+               "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \
-                "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \
--       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-+       "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \
-                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
- 
- #define USB_BOOTCMD \
-@@ -279,7 +279,8 @@
- #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
- #endif
- #define CONFIG_EXTRA_ENV_SETTINGS \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+               "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run nfsboot ; echo ; echo nfsboot failed ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
--- 
-1.9.1
-
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 @@
-diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h
---- git.orig/include/configs/colibri_imx7.h     2016-07-15 12:31:35.915934824 +0300
-+++ git/include/configs/colibri_imx7.h  2016-07-15 12:32:40.867937388 +0300
-@@ -248,7 +248,7 @@
-                "${board}/flash_eth.img && source ${loadaddr}\0" \
-        "setsdupdate=mmc rescan && setenv interface mmc && " \
-                "fatload ${interface} 0:1 ${loadaddr} " \
--               "${board}/flash_blk.img && source ${loadaddr}\0" \
-+               "/flash_blk.img && source ${loadaddr}\0" \
-        "setup=setenv setupargs " \
-                "console=tty1 console=${console}" \
-                ",${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 @@
-From f480a948551b0e5592d93cb7a5dc1653de900909 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 24 Feb 2016 16:01:33 +0200
-Subject: [PATCH] colibri vf: remove console from tty1
-
----
- include/configs/colibri_vf.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index b870812..0726fc5 100644
---- a/include/configs/colibri_vf.h
-+++ b/include/configs/colibri_vf.h
-@@ -202,7 +202,7 @@
-                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
-                "source ${loadaddr}\0" \
-        "setup=setenv setupargs " \
--               "console=tty1 console=${console}" \
-+               "console=${console}" \
-                ",${baudrate}n8 ${memargs} consoleblank=0\0" \
-        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
-        "setusbupdate=usb start && setenv interface usb && " \
--- 
-1.9.1
-
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 @@
-diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h
---- git.orig/include/configs/colibri_vf.h       2016-07-15 12:05:41.263873456 +0300
-+++ git/include/configs/colibri_vf.h    2016-07-15 12:06:19.759874976 +0300
-@@ -161,8 +161,8 @@
-        "sdargs=root=/dev/mmcblk0p2 rw rootwait\0"      \
-        "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-        "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
--       "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
--       "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-+       "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \
-+       "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \
-        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- 
- #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 @@
 ##
 ############################################################################
 
+PV = "v2015.04-v2.6b2.1+git${SRCPV}"
+SRCREV_b2qt = "90a974d34aaa85d5ce69f83067928592c5389990"
+SRCBRANCH = "2015.04-toradex"
+COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
+
+do_deploy_append_apalis-imx6() {
+    cd ${DEPLOYDIR}
+    ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type}
+    ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type}
+}
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
-        file://0001-colibri-vf-remove-console-from-tty1.patch \
-        file://0002-colibri-vf-fix-mmc-boot.patch \
-        file://0001-Update-default-args-for-apalis-imx6.patch \
-        file://0001-colibri-imx7-fix-update-u-boot.patch \
+        file://0001-Make-sdboot-default-on-all-boards.patch \
         "
-
-do_compile_append () {
-  if [ "${MACHINE}" = "colibri-vf" ]; then
-    oe_runmake u-boot-nand.imx
-  fi
-
-}