toradex: remove old update system

Remove extra u-boot script used to update u-boot in the device.
Toradex no longer maintains these and instead rely on the
easy installer.

Change-Id: I3e6234f35e7d4218388f76cafeefcdc319aec291
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

22 files changed, 0 insertions, 392 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index 3ad10207..bb202988 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -31,11 +31,6 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
-IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
-    "
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 172c7328..f8d19112 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -30,9 +30,3 @@
 include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
-
-IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
-    "
-
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index c8eeee15..7eea5266 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -31,10 +31,6 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
 
-IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx;${MACHINEDIR}/u-boot.imx \
-    "
-
 UBOOT_MAKE_TARGET = "u-boot.imx"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan opengl"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
index 5fa6ebd1..fbad3ff9 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
@@ -31,10 +31,6 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7 eMMC"
 
-IMAGE_BOOT_FILES += " \
-    u-boot.imx;${MACHINEDIR}/u-boot.imx \
-    "
-
 DISTRO_FEATURES_remove = "webengine wayland vulkan opengl"
 
 
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 5e4f2a01..c6c169e7 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -31,10 +31,6 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 
-IMAGE_BOOT_FILES += " \
-    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
-    "
-
 DISTRO_FEATURES_remove = "webengine wayland vulkan opengl"
 
 
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 079852bb..c7173746 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -36,20 +36,6 @@ BBMASK += "\
     meta-toradex-nxp/recipes-graphics/xorg-xserver \
 "
 
-WKS_FILE_DEPENDS_append_mx6 = " u-boot-script-toradex"
-WKS_FILE_DEPENDS_append_mx7 = " u-boot-script-toradex"
-
-MACHINEDIR = "${@d.getVar('MACHINE').replace('-','_')}"
-
-SCRIPTS = "\
-    fwd_blk.img;flash_blk.img \
-    fwd_eth.img;flash_eth.img \
-    fwd_mmc.img;flash_mmc.img \
-    ${MACHINE}/*;${MACHINEDIR}/ \
-"
-IMAGE_BOOT_FILES_append_mx6 += "${SCRIPTS}"
-IMAGE_BOOT_FILES_append_mx7 += "${SCRIPTS}"
-
 IMAGE_FSTYPES += "teziimg"
 
 # Placeholder for TEZI_DATE introduced in meta-toradex-bsp-common layer.
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb
deleted file mode 100644
index 183848af..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex.bb
+++ /dev/null
@@ -1,72 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=c8b6dd132d52c6e5a545df07a4e3e283"
-DEPENDS = "u-boot-mkimage-native"
-
-PV = "3.0b2"
-
-SRC_URI = " \
-    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}"
-
-inherit deploy
-
-do_mkimage () {
-    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} \
-                  ${S}/$(basename ${scr} .scr).img
-    done
-}
-
-addtask mkimage after do_compile before do_install
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/${MACHINE}
-    install -m 0644 -t ${DEPLOYDIR} ${S}/*.img
-    ln -fs ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/
-    ln -fs ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/
-}
-
-addtask deploy after do_install before do_build
-
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch
deleted file mode 100644
index 999828ea..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c563131a55ebf0f2956d5e6df400c45ae72cff38 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index b8b8a93..824b6dc 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -10,6 +10,6 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag
- setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
--setenv update 'mtdparts default && 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'
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr
deleted file mode 100644
index b8b8a930..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-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 else run prepare_kernel_fdt && && run prepare_rootfs; fi'
-
-setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update 'mtdparts default && 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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr
deleted file mode 100644
index c65c1d3d..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-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 else run prepare_kernel_fdt && && run prepare_rootfs; fi'
-
-setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update 'mtdparts default && 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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch
deleted file mode 100644
index e69de29b..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch
+++ /dev/null
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr
deleted file mode 100644
index 8524cef8..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr
+++ /dev/null
@@ -1,2 +0,0 @@
-echo 'Legacy update is not supported for this module type'
-
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr
deleted file mode 100644
index 8524cef8..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr
+++ /dev/null
@@ -1,2 +0,0 @@
-echo 'Legacy update is not supported for this module type'
-
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
deleted file mode 100644
index 2235fae3..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7e05ac9e6dc984bd060d766740ff494e0e3519d7 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 | 2 +-
- flash_eth.scr | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index 9fa6296..e599070 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-c
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
- # Test which version of U-Boot we are currently running on
--setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-+setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot; fi'
- 
- if itest.b *0x30360800 -lt 0x11; then
- echo &&
-diff --git a/flash_eth.scr b/flash_eth.scr
-index 20244d7..7f3372c 100644
---- a/flash_eth.scr
-+++ b/flash_eth.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_boa
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
- # Test which version of U-Boot we are currently running on
--setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-+setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && reset; fi'
- 
- if itest.b *0x30360800 -lt 0x11; then
- echo &&
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
deleted file mode 100644
index 9fa6296c..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-# 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 upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"'
-setenv update_uboot_old 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg'
-setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-# Test which version of U-Boot we are currently running on
-setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-
-if itest.b *0x30360800 -lt 0x11; then
-echo &&
-echo 'NOTE: The U-Boot provided with this BSP version does not support the' &&
-echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' &&
-echo 'update the kernel/device-tree/rootfs manually using: ' &&
-echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' &&
-echo && setenv update_uboot; setenv update_uboot_old; setenv update
-else
-echo 'enter "run update" to update the entire module'
-fi
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
deleted file mode 100644
index 20244d71..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-# 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 upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"'
-setenv update_uboot_old 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg'
-setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-# Test which version of U-Boot we are currently running on
-setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-
-if itest.b *0x30360800 -lt 0x11; then
-echo &&
-echo 'NOTE: The U-Boot provided with this BSP version does not support the' &&
-echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' &&
-echo 'update the kernel/device-tree/rootfs manually using: ' &&
-echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' &&
-echo && setenv update_uboot; setenv update_uboot_old; setenv update
-else
-echo 'enter "run update" to update the entire module'
-fi
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr
deleted file mode 100644
index 7af72e6d..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr
+++ /dev/null
@@ -1,11 +0,0 @@
-#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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr
deleted file mode 100644
index d7ea35c2..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr
+++ /dev/null
@@ -1,6 +0,0 @@
-#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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr
deleted file mode 100644
index 4c8f666f..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr
+++ /dev/null
@@ -1,3 +0,0 @@
-#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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch
deleted file mode 100644
index 91aa2bc5..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 735a68d1e110edead4b858499c8d97be3e90d0f8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 15 May 2017 14:04:38 +0300
-Subject: [PATCH] Update only u-boot
-
----
- flash_blk.scr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index 5c75100..5c8486d 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -38,7 +38,7 @@ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migr
- 
- # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
- setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
--setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-+setenv update_latest 'run update_to_spl; run update_uboot'
- # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
- setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
- # 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
deleted file mode 100644
index 12d89cf4..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
+++ /dev/null
@@ -1,47 +0,0 @@
-test -n ${interface} || setenv interface mmc
-test -n ${drive} || setenv drive 1
-setenv uboot_hwpart 1
-
-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 filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
-setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
-
-setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3'
-
-setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1'
-setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0'
-
-setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
-
-setenv update_spl 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
-setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
-
-setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
-
-setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
-
-setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv update_1 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1'
-setenv update_2 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}'
-#do it in chunks of 64M to fit into DDR RAM of the smallest module
-setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true'
-
-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'
-
-# Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
-setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
-setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-# 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
-# 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
-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-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
deleted file mode 100644
index ee915232..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
+++ /dev/null
@@ -1,45 +0,0 @@
-setenv uboot_hwpart 1
-
-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 filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
-setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
-
-setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3'
-
-setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1'
-setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0'
-
-setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
-
-setenv update_spl 'tftpboot ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
-setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
-
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
-
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
-
-setenv update_configblock 'run check_configblock; tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv update_1 'tftpboot ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1'
-setenv update_2 'tftpboot ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}'
-#do it in chunks of 64M to fit into DDR RAM of the smallest module
-setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true'
-
-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'
-
-# Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
-setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
-setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-# 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
-# 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
-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'