images: drop the legacy update procedure

Use the Toradex Easy Installer instead.
If you included tdx-image-fstype.inc in your image recipes you will have
to remove that include.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

84 files changed, 0 insertions, 2648 deletions

diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb
index 9da53a2..69ea3d2 100644
--- a/recipes-images/images/console-tdx-image.bb
+++ b/recipes-images/images/console-tdx-image.bb
@@ -19,9 +19,6 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
 
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 IMAGE_LINGUAS = "en-us"
 #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/files/apalis-imx6/library b/recipes-images/images/files/apalis-imx6/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/apalis-imx6/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_blk.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_blk.scr
deleted file mode 120000
index e980bc6..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/imx6/flash_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_eth.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_eth.scr
deleted file mode 120000
index 18c02a9..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/imx6/flash_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_blk.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_eth.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_mmc.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_mmc.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/imx_flash/genext4fs.sh b/recipes-images/images/files/apalis-imx6/update/imx_flash/genext4fs.sh
deleted file mode 120000
index f7eeef9..0000000
--- a/recipes-images/images/files/apalis-imx6/update/imx_flash/genext4fs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/genext4fs.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/update/update.sh b/recipes-images/images/files/apalis-imx6/update/update.sh
deleted file mode 120000
index fc60d21..0000000
--- a/recipes-images/images/files/apalis-imx6/update/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-../library/imx6/update.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/library b/recipes-images/images/files/apalis-tk1-mainline/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
deleted file mode 100644
index 556a40e..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
+++ /dev/null
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/apalis-tk1.img.cfg b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/apalis-tk1.img.cfg
deleted file mode 100644
index b9d203c..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/apalis-tk1.img.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2016 Toradex, Inc.
-#
-# This software is provided 'as-is', without any express or implied
-# warranty. In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-Version       = 0x00400001;
-Bctcopy       = 1;
-Bctfile       = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct;
-BootLoader    = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete;
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_blk.scr
deleted file mode 100644
index 76868d5..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_blk.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-test -n ${drive} || setenv drive 1
-test -n ${fdt_module} || setenv fdt_module apalis
-test -n ${interface} || setenv interface mmc
-
-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 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_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}'
-
-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}/${soc}-${fdt_module}-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb ${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_rootfs 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done'
-
-setenv update 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_rootfs; reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_eth.scr
deleted file mode 100644
index 2793bac..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_eth.scr
+++ /dev/null
@@ -1,27 +0,0 @@
-test -n ${fdt_module} || setenv fdt_module apalis
-
-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 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_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}'
-
-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}/${soc}-${fdt_module}-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb ${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_rootfs 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done'
-
-setenv update 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_rootfs; reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_blk.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_eth.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_mmc.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_mmc.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/tegra-uboot-flasher/genext4fs.sh b/recipes-images/images/files/apalis-tk1-mainline/update/tegra-uboot-flasher/genext4fs.sh
deleted file mode 120000
index f7eeef9..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/tegra-uboot-flasher/genext4fs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/genext4fs.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update/update.sh b/recipes-images/images/files/apalis-tk1-mainline/update/update.sh
deleted file mode 120000
index 6ebea84..0000000
--- a/recipes-images/images/files/apalis-tk1-mainline/update/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-../library/tegra/update.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/library b/recipes-images/images/files/apalis-tk1/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/apalis-tk1/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
deleted file mode 100644
index 556a40e..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
+++ /dev/null
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/apalis-tk1.img.cfg b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/apalis-tk1.img.cfg
deleted file mode 100644
index b9d203c..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/apalis-tk1.img.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2016 Toradex, Inc.
-#
-# This software is provided 'as-is', without any express or implied
-# warranty. In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-Version       = 0x00400001;
-Bctcopy       = 1;
-Bctfile       = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct;
-BootLoader    = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete;
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_blk.scr
deleted file mode 100644
index 76868d5..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_blk.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-test -n ${drive} || setenv drive 1
-test -n ${fdt_module} || setenv fdt_module apalis
-test -n ${interface} || setenv interface mmc
-
-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 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_uboot 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}'
-
-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}/${soc}-${fdt_module}-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb ${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_rootfs 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done'
-
-setenv update 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_rootfs; reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_eth.scr
deleted file mode 100644
index 2793bac..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_eth.scr
+++ /dev/null
@@ -1,27 +0,0 @@
-test -n ${fdt_module} || setenv fdt_module apalis
-
-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 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_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${fdt_addr_r} 0x0 ${blkcnt}'
-
-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}/${soc}-${fdt_module}-${fdt_board}.dtb && fatwrite mmc 0:1 ${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb ${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_rootfs 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done'
-
-setenv update 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_rootfs; reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_blk.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_eth.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_mmc.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_mmc.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/tegra-uboot-flasher/genext4fs.sh b/recipes-images/images/files/apalis-tk1/update/tegra-uboot-flasher/genext4fs.sh
deleted file mode 120000
index f7eeef9..0000000
--- a/recipes-images/images/files/apalis-tk1/update/tegra-uboot-flasher/genext4fs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/genext4fs.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/update/update.sh b/recipes-images/images/files/apalis-tk1/update/update.sh
deleted file mode 120000
index 6ebea84..0000000
--- a/recipes-images/images/files/apalis-tk1/update/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-../library/tegra/update.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/library b/recipes-images/images/files/colibri-imx6/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/colibri-imx6/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_blk.scr
deleted file mode 120000
index e980bc6..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/imx6/flash_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_eth.scr
deleted file mode 120000
index 18c02a9..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/imx6/flash_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_mmc.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_mmc.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/imx_flash/genext4fs.sh b/recipes-images/images/files/colibri-imx6/update/imx_flash/genext4fs.sh
deleted file mode 120000
index f7eeef9..0000000
--- a/recipes-images/images/files/colibri-imx6/update/imx_flash/genext4fs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/genext4fs.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update/update.sh b/recipes-images/images/files/colibri-imx6/update/update.sh
deleted file mode 120000
index fc60d21..0000000
--- a/recipes-images/images/files/colibri-imx6/update/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-../library/imx6/update.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/library b/recipes-images/images/files/colibri-imx6ull/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/colibri-imx6ull/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_blk.scr
deleted file mode 100644
index b8b8a93..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/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/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_eth.scr
deleted file mode 100644
index c65c1d3..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/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/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/update/update.sh b/recipes-images/images/files/colibri-imx6ull/update/update.sh
deleted file mode 100755
index 03cd893..0000000
--- a/recipes-images/images/files/colibri-imx6ull/update/update.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#! /bin/sh
-# Prepare files needed for flashing a Colibri iMX6ULL module and
-# copy them to a convenient location for using from a running U-Boot
-
-set -e
-
-Flash()
-{
-	echo "To flash the Colibri iMX6ULL module a running U-Boot is required. Boot the"
-	echo "module to the U-Boot prompt and"
-	echo ""
-	echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only"
-	echo "and enter:"
-	echo "'run setupdate'"
-	echo ""
-	echo "then to update all components enter:"
-	echo "'run update'"
-	echo ""
-	echo "Alternatively, to update U-Boot enter:"
-	echo "'run update_uboot'"
-	echo "to update a component stored in UBI enter:"
-	echo "'run prepare_ubi'"
-	echo "followed by one of:"
-	echo "'run update_kernel'"
-	echo "'run update_fdt'"
-	echo "'run update_rootfs'"
-	echo ""
-	echo ""
-	echo "If you don't have a working U-Boot anymore, connect your PC to the module's"
-	echo "USB client port, bring the module into the serial download mode and start the update.sh"
-	echo "script with the -d option. This will copy U-Boot into the module's RAM and"
-	echo "execute it."
-	echo ""
-	echo "Then use the following command to get U-Boot running:"
-	echo "'./update.sh -d'"
-	echo ""
-	echo "Next, recreate the Boot Configuration Block and the Toradex Config Block:"
-	echo "'run setupdate'"
-	echo "'run update_uboot'"
-	echo "'run create_bcb'"
-	echo "'cfgblock create'"
-}
-
-Usage()
-{
-	echo ""
-	echo "Prepares and copies files for flashing internal NAND of Colibri iMX6ULL"
-	echo ""
-	echo "The recommended way is to copy the files on a SD card or USB flash drive."
-	echo "The script format_sd.sh may be used to format the SD card."
-	echo ""
-	echo "The flash step requires a running U-Boot on the target. Either one already"
-	echo "flashed on the NAND or downloaded using serial downloader (argument -d)."
-	echo ""
-	echo "-d           : use a USB connection to copy/execute U-Boot to/from module's RAM"
-	echo "-f           : flash instructions"
-	echo "-h           : prints this message"
-	echo "-m           : module type: 0: autodetect from ./rootfs/etc/issues (default)"
-	echo "                            1: Colibri iMX6ULL"
-	echo "-o directory : output directory"
-	echo ""
-	echo "Example \"./update.sh -o /media/KERNEL/\" copies the required files to SD card"
-	echo ""
-	echo "*** For detailed recovery/update procedures, refer to the following website: ***"
-	echo "http://developer.toradex.com/knowledge-base/flashing-embedded-linux-to-imx7-modules"
-	echo ""
-}
-
-# initialise options
-KERNEL_DEVICETREE="%kernel_device_trees%"
-KERNEL_IMAGETYPE="zImage"
-MODTYPE_DETECT=0
-
-# NAND parameters
-BLOCK=124KiB
-MAXLEB=8112
-PAGE=2KiB
-
-OUT_DIR=""
-UBOOT_RECOVERY=0
-
-while getopts "dfhm:o:" Option ; do
-	case $Option in
-		d)	UBOOT_RECOVERY=1
-			;;
-		f)	Flash
-			exit 0
-			;;
-		h)	Usage
-			exit 0
-			;;
-		m)	MODTYPE_DETECT=$OPTARG
-			;;
-		o)	OUT_DIR=$OPTARG
-			;;
-	esac
-done
-
-if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	Usage
-	exit 1
-fi
-
-# is OUT_DIR an existing directory?
-if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	echo "$OUT_DIR" "does not exist, exiting"
-	exit 1
-fi
-
-case $MODTYPE_DETECT in
-	0)	# auto detect MODTYPE from rootfs directory
-		if [ -f rootfs/etc/issue ] ; then
-			CNT=`grep -c "MX6ULL" rootfs/etc/issue || true`
-			if [ "$CNT" -ge 1 ] ; then
-				echo "Colibri iMX6ULL rootfs detected"
-				MODTYPE=colibri-imx6ull
-			fi
-		fi
-		if [ -e $MODTYPE ] ; then
-			echo "can not detect module type from ./rootfs/etc/issue"
-			echo "please specify the module type with the -m parameter"
-			echo "see help: '$ ./update.sh -h'"
-			echo "exiting"
-			exit 1
-		fi
-		;;
-	1)	MODTYPE=colibri-imx6ull
-		echo "Colibri iMX6ULL rootfs specified"
-		;;
-	*)	echo "-m paramter specifies an unknown value"
-		exit 1
-		;;
-esac
-
-case "$MODTYPE" in
-	"colibri-imx6ull")
-		IMAGEFILE=ubifs.img
-		LOCPATH="imx_flash"
-		OUT_DIR="$OUT_DIR/colibri-imx6ull"
-		;;
-	*)	echo "script internal error, unknown module type set"
-		exit 1
-		;;
-esac
-
-BINARIES=${MODTYPE}_bin
-
-#is only U-Boot to be copied to RAM?
-if [ "$UBOOT_RECOVERY" -eq 1 ] ; then
-	echo "Put the module in recovery mode and press [ENTER]..."
-	read RESULT
-	sudo ${LOCPATH}/imx_usb ${BINARIES}/u-boot.imx
-	exit
-fi
-
-#sanity check for correct untared rootfs
-DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'`
-if [ "${DEV_OWNER}x" != "rootx" ]
-then
-	printf "rootfs/dev is not owned by root, but it should!\n"
-	printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n"
-	printf "e.g. sudo tar xjvf Colibri-iMX6ULL_LXDE-Image_2.7b4-20171001.tar.bz2\n"
-	exit 1
-fi
-
-#sanity check, can we execute mkfs.ubifs, e.g. see the help text?
-CNT=`sudo $LOCPATH/mkfs.ubifs -h | grep -c space-fixup || true`
-if [ "$CNT" -eq 0 ] ; then
-	echo "The program mkfs.ubifs can not be executed or does not provide --space-fixup"
-	echo "option."
-	echo "Are you on a 64bit Linux host without installed 32bit execution environment?"
-	printf "\033[1mPlease install e.g. ia32-libs on 64-bit Ubuntu\033[0m"
-	printf "\033[1mMaybe others are needed e.g. liblzo2:i386 on 64-bit Ubuntu\033[0m"
-	exit 1
-fi
-
-#Install trap to write a sensible message in case any of the commands below
-#exit premature...
-trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT
-
-# Prepare full flashing
-sudo $LOCPATH/mkfs.ubifs --space-fixup -c ${MAXLEB} -e ${BLOCK} -m ${PAGE} -o ${BINARIES}/${IMAGEFILE} -r rootfs/ -v
-
-echo ""
-echo "UBI image of root file system generated, copying data to target folder..."
-
-#make a file with the used versions for U-Boot, kernel and rootfs
-sudo touch ${BINARIES}/versions.txt
-sudo chmod ugo+w ${BINARIES}/versions.txt
-echo "Component Versions" > ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/u-boot.imx`" >> ${BINARIES}/versions.txt
-ROOTFSVERSION=`grep MX6 rootfs/etc/issue || echo "Version Unknown"`
-echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt
-
-#create subdirectory for this module type
-sudo mkdir -p "$OUT_DIR"
-
-# Copy device tree file
-COPIED=false
-if test -n "${KERNEL_DEVICETREE}"; then
-	for DTB_FILE in ${KERNEL_DEVICETREE}; do
-		if [ -e "${BINARIES}/${DTB_FILE}" ]; then
-			sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/"
-			COPIED=true
-		fi
-	done
-	[ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}.  Aborting."; exit 1; }
-fi
-
-#copy to $OUT_DIR
-sudo cp ${BINARIES}/u-boot-nand.imx ${BINARIES}/zImage ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
-sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img"
-sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img"
-#cleanup intermediate files
-sudo rm ${BINARIES}/ubifs.img ${BINARIES}/versions.txt
-sync
-
-#Remove trap and report success!
-trap - EXIT
-printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n"
-
-Flash
diff --git a/recipes-images/images/files/colibri-imx7/library b/recipes-images/images/files/colibri-imx7/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/colibri-imx7/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_blk.scr
deleted file mode 100644
index 9fa6296..0000000
--- a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/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/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_eth.scr
deleted file mode 100644
index 20244d7..0000000
--- a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/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/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx7/update/update.sh b/recipes-images/images/files/colibri-imx7/update/update.sh
deleted file mode 100755
index f6dfcc2..0000000
--- a/recipes-images/images/files/colibri-imx7/update/update.sh
+++ /dev/null
@@ -1,223 +0,0 @@
-#! /bin/sh
-# Prepare files needed for flashing a Colibri iMX7 module and
-# copy them to a convenient location for using from a running U-Boot
-
-set -e
-
-Flash()
-{
-	echo "To flash the Colibri iMX7 module a running U-Boot is required. Boot the"
-	echo "module to the U-Boot prompt and"
-	echo ""
-	echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only"
-	echo "and enter:"
-	echo "'run setupdate'"
-	echo ""
-	echo "then to update all components enter:"
-	echo "'run update'"
-	echo ""
-	echo "Alternatively, to update U-Boot enter:"
-	echo "'run update_uboot'"
-	echo "to update a component stored in UBI enter:"
-	echo "'run prepare_ubi'"
-	echo "followed by one of:"
-	echo "'run update_kernel'"
-	echo "'run update_fdt'"
-	echo "'run update_rootfs'"
-	echo ""
-	echo ""
-	echo "If you don't have a working U-Boot anymore, connect your PC to the module's"
-	echo "USB client port, bring the module into the serial download mode and start the update.sh"
-	echo "script with the -d option. This will copy U-Boot into the module's RAM and"
-	echo "execute it."
-	echo ""
-	echo "Then use the following command to get U-Boot running:"
-	echo "'./update.sh -d'"
-	echo ""
-	echo "Next, recreate the Boot Configuration Block and the Toradex Config Block:"
-	echo "'run setupdate'"
-	echo "'run update_uboot'"
-	echo "'run create_bcb'"
-	echo "'cfgblock create'"
-}
-
-Usage()
-{
-	echo ""
-	echo "Prepares and copies files for flashing internal NAND of Colibri iMX7"
-	echo ""
-	echo "The recommended way is to copy the files on a SD card or USB flash drive."
-	echo "The script format_sd.sh may be used to format the SD card."
-	echo ""
-	echo "The flash step requires a running U-Boot on the target. Either one already"
-	echo "flashed on the NAND or downloaded using serial downloader (argument -d)."
-	echo ""
-	echo "-d           : use a USB connection to copy/execute U-Boot to/from module's RAM"
-	echo "-f           : flash instructions"
-	echo "-h           : prints this message"
-	echo "-m           : module type: 0: autodetect from ./rootfs/etc/issues (default)"
-	echo "                            1: Colibri iMX7"
-	echo "-o directory : output directory"
-	echo ""
-	echo "Example \"./update.sh -o /media/KERNEL/\" copies the required files to SD card"
-	echo ""
-	echo "*** For detailed recovery/update procedures, refer to the following website: ***"
-	echo "http://developer.toradex.com/knowledge-base/flashing-embedded-linux-to-imx7-modules"
-	echo ""
-}
-
-# initialise options
-KERNEL_DEVICETREE="%kernel_device_trees%"
-KERNEL_IMAGETYPE="zImage"
-MODTYPE_DETECT=0
-
-# NAND parameters
-BLOCK=124KiB
-MAXLEB=8112
-PAGE=2KiB
-
-OUT_DIR=""
-UBOOT_RECOVERY=0
-
-while getopts "dfhm:o:" Option ; do
-	case $Option in
-		d)	UBOOT_RECOVERY=1
-			;;
-		f)	Flash
-			exit 0
-			;;
-		h)	Usage
-			exit 0
-			;;
-		m)	MODTYPE_DETECT=$OPTARG
-			;;
-		o)	OUT_DIR=$OPTARG
-			;;
-	esac
-done
-
-if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	Usage
-	exit 1
-fi
-
-# is OUT_DIR an existing directory?
-if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	echo "$OUT_DIR" "does not exist, exiting"
-	exit 1
-fi
-
-case $MODTYPE_DETECT in
-	0)	# auto detect MODTYPE from rootfs directory
-		if [ -f rootfs/etc/issue ] ; then
-			CNT=`grep -c "MX7" rootfs/etc/issue || true`
-			if [ "$CNT" -ge 1 ] ; then
-				echo "Colibri iMX7 rootfs detected"
-				MODTYPE=colibri-imx7
-			fi
-		fi
-		if [ -e $MODTYPE ] ; then
-			echo "can not detect module type from ./rootfs/etc/issue"
-			echo "please specify the module type with the -m parameter"
-			echo "see help: '$ ./update.sh -h'"
-			echo "exiting"
-			exit 1
-		fi
-		;;
-	1)	MODTYPE=colibri-imx7
-		echo "Colibri iMX7 rootfs specified"
-		;;
-	*)	echo "-m paramter specifies an unknown value"
-		exit 1
-		;;
-esac
-
-case "$MODTYPE" in
-	"colibri-imx7")
-		IMAGEFILE=ubifs.img
-		LOCPATH="imx_flash"
-		OUT_DIR="$OUT_DIR/colibri_imx7"
-		;;
-	*)	echo "script internal error, unknown module type set"
-		exit 1
-		;;
-esac
-
-BINARIES=${MODTYPE}_bin
-
-#is only U-Boot to be copied to RAM?
-if [ "$UBOOT_RECOVERY" -eq 1 ] ; then
-	echo "Put the module in recovery mode and press [ENTER]..."
-	read RESULT
-	sudo ${LOCPATH}/imx_usb ${BINARIES}/u-boot-nand.imx
-	exit
-fi
-
-#sanity check for correct untared rootfs
-DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'`
-if [ "${DEV_OWNER}x" != "rootx" ]
-then
-	printf "rootfs/dev is not owned by root, but it should!\n"
-	printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n"
-	printf "e.g. sudo tar xjvf Colibri_iMX7_LinuxImageV2.6_20160331.tar.bz2\n"
-	exit 1
-fi
-
-#sanity check, can we execute mkfs.ubifs, e.g. see the help text?
-CNT=`sudo $LOCPATH/mkfs.ubifs -h | grep -c space-fixup || true`
-if [ "$CNT" -eq 0 ] ; then
-	echo "The program mkfs.ubifs can not be executed or does not provide --space-fixup"
-	echo "option."
-	echo "Are you on a 64bit Linux host without installed 32bit execution environment?"
-	printf "\033[1mPlease install e.g. ia32-libs on 64-bit Ubuntu\033[0m"
-	printf "\033[1mMaybe others are needed e.g. liblzo2:i386 on 64-bit Ubuntu\033[0m"
-	exit 1
-fi
-
-#Install trap to write a sensible message in case any of the commands below
-#exit premature...
-trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT
-
-# Prepare full flashing
-sudo $LOCPATH/mkfs.ubifs --space-fixup -c ${MAXLEB} -e ${BLOCK} -m ${PAGE} -o ${BINARIES}/${IMAGEFILE} -r rootfs/ -v
-
-echo ""
-echo "UBI image of root file system generated, copying data to target folder..."
-
-#make a file with the used versions for U-Boot, kernel and rootfs
-sudo touch ${BINARIES}/versions.txt
-sudo chmod ugo+w ${BINARIES}/versions.txt
-echo "Component Versions" > ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/u-boot-nand.imx`" >> ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${KERNEL_IMAGETYPE}`" >> ${BINARIES}/versions.txt
-ROOTFSVERSION=`grep MX7 rootfs/etc/issue || echo "Version Unknown"`
-echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt
-
-#create subdirectory for this module type
-sudo mkdir -p "$OUT_DIR"
-
-# Copy device tree file
-COPIED=false
-if test -n "${KERNEL_DEVICETREE}"; then
-	for DTB_FILE in ${KERNEL_DEVICETREE}; do
-		if [ -e "${BINARIES}/${DTB_FILE}" ]; then
-			sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/"
-			COPIED=true
-		fi
-	done
-	[ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}.  Aborting."; exit 1; }
-fi
-
-#copy to $OUT_DIR
-sudo cp ${BINARIES}/u-boot-nand.imx ${BINARIES}/zImage ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
-sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img"
-sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img"
-#cleanup intermediate files
-sudo rm ${BINARIES}/ubifs.img ${BINARIES}/versions.txt
-sync
-
-#Remove trap and report success!
-trap - EXIT
-printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n"
-
-Flash
diff --git a/recipes-images/images/files/colibri-vf/library b/recipes-images/images/files/colibri-vf/library
deleted file mode 120000
index 53bed96..0000000
--- a/recipes-images/images/files/colibri-vf/library
+++ /dev/null
@@ -1 +0,0 @@
-../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/update/README b/recipes-images/images/files/colibri-vf/update/README
deleted file mode 100644
index 8d283da..0000000
--- a/recipes-images/images/files/colibri-vf/update/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Toradex Linux BSP
-=================
-
-Use the update.sh script to update your module. Check the Release Notes for
-detailed instruction how to use flash your module. The Release Notes is located
-in the same directory of the BSP release tarball.
diff --git a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_blk.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_blk.scr
deleted file mode 100644
index ae0fd5c..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_blk.scr
+++ /dev/null
@@ -1,28 +0,0 @@
-setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
-setenv update_configblock 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 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 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot'
-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}'
-
-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/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_eth.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_eth.scr
deleted file mode 100644
index b0e4904..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_eth.scr
+++ /dev/null
@@ -1,28 +0,0 @@
-setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
-setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 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 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot'
-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}'
-
-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/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_blk.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_blk.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_eth.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_eth.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_mmc.scr
+++ /dev/null
@@ -1 +0,0 @@
-../../library/fwd_mmc.scr
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../library/mk-u-boot-scripts.sh
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/update/format_sd.sh b/recipes-images/images/files/colibri-vf/update/format_sd.sh
deleted file mode 100755
index 79cc985..0000000
--- a/recipes-images/images/files/colibri-vf/update/format_sd.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#! /bin/sh
-# Format a SD card to be used for flashing a Colibri VFxx module
-# Then calls update.sh to add needed files
-
-# sometimes we need the binary echo, not the shell builtin
-ECHO=`which echo`
-
-Usage()
-{
-	echo ""
-	echo "Formats and fills a SD card with files for flashing the internal NAND of a"
-	echo "Colibri VFxx. Optionally creates a rootfs partition to allow booting and taking"
-	echo "kernel and rootfs from SD card."
-	echo "ALL DATA ON THE DEVICE GIVEN WITH -d WILL BE DELETED!!"
-	echo
-	echo "Requires a running U-Boot on the target. Either one already flashed on the NAND"
-	echo "or strapping the board to boot from SD card and booting U-Boot from the card"
-	echo "(only possible on older samples without blown boot fuses)."
-	echo ""
-	echo "-h : Prints this message"
-	echo ""
-	echo "-d FILE : device file of the SD card"
-	echo "-f      : additionally copy the rootfs into the second partition"
-	echo "-s      : optimise file system for 128MB NAND, increases usable space"
-	echo "          on VF50 module a little, but on VF61 uses also only 128MB"
-	echo ""
-	echo "Example \"./format_sd.sh -d /dev/mmcblk0\" prepares the SD card /dev/mmcblk0"
-	echo ""
-}
-
-#initialise options
-DEV="/dev/null"
-CFGBLOCK_ONLY=0
-DEBUG_ONLY=0
-KERNEL_ONLY=0
-UBOOT_ONLY=0
-CP_ROOTFS=0
-
-while getopts "hd:fs" Option ; do
-	case $Option in
-		h) 	Usage
-			# Exit if only usage (-h) was specified.
-			if [[ $# -eq 1 ]] ; then
-				exit 10
-			fi
-			exit 0
-			;;
-		d) 	DEV=$OPTARG
-			;;
-		f)	CP_ROOTFS=1
-			;;
-		s)	UPDATE_OPTS="-s"
-	esac
-done
-
-DEVNAME=`basename $DEV`
-DEVNAMESTART=`echo $DEVNAME | cut -c 1-3`
-
-# sanity checks to try and not touch one of the users hard drives or other issues
-if [ ! -b $DEV ] ; then
-	echo $DEV "is not a block device, "
-	echo "please specify the device file representing your SD card"
-	exit 1
-fi
-if [ "$DEVNAMESTART" = "sda"  ] ; then
-	echo $DEV "seems to be your primary hard disk,"
-	echo "please specify the device file representing your SD card"
-	exit 1
-fi
-if [ ! -d /sys/block/$DEVNAME  ] ; then
-	echo "/sys/block/$DEVNAME"
-	echo $DEV "seems to not be a disk, please specify the device file"
-	echo "representing your SD card (without any trailing number)"
-	exit 1
-fi
-IS_USB_MMC=`ls -l /sys/block/$DEVNAME | grep -c "usb\|mmc"`
-if [ $IS_USB_MMC -eq 0  ] ; then
-	echo $DEV "seems not to be connected over USB or MMC, please specify the device file"
-	echo "representing your SD card (without any trailing number)"
-	exit 1
-fi
-
-if [ "$DEVNAMESTART" = "mmc"  ] ; then
-        PART_PREFIX="p"
-else
-        PART_PREFIX=""
-fi
-# make sure the partitions are unmounted
-sudo umount ${DEV}${PART_PREFIX}?
-
-# partition and format the vfat partition
-sudo parted -s $DEV   mklabel msdos   mkpart primary fat32 1MB 512MB   mkpart primary ext3 512MB 100%
-sudo umount ${DEV}${PART_PREFIX}1
-sudo mkfs.fat -n UPDATE ${DEV}${PART_PREFIX}1
-
-# dd U-Boot onto the SD card
-sudo dd if=colibri-vf_bin/u-boot.imx of=${DEV} bs=512 seek=2
-
-sudo mkdir -p mntpoint1
-sudo mount -t vfat ${DEV}${PART_PREFIX}1 mntpoint1 -o umask=0
-
-# now copy U-Boot, kernel and ubi-img to the KERNEL partition
-DEST=`readlink -e mntpoint1`
-./update.sh -o "$DEST" $UPDATE_OPTS
-
-#copy the rootfs
-if [ "$CP_ROOTFS" -eq 1 ] ; then
-	sudo umount ${DEV}${PART_PREFIX}2
-	sudo mkfs.ext3 -L RFS ${DEV}${PART_PREFIX}2 && sync
-	sudo mkdir -p mntpoint2
-	sudo mount -t ext3 ${DEV}${PART_PREFIX}2 mntpoint2
-	sudo cp -pPr rootfs/* mntpoint2/
-fi
-
-sudo umount ${DEV}${PART_PREFIX}?
diff --git a/recipes-images/images/files/colibri-vf/update/update.sh b/recipes-images/images/files/colibri-vf/update/update.sh
deleted file mode 100755
index 0b6b3af..0000000
--- a/recipes-images/images/files/colibri-vf/update/update.sh
+++ /dev/null
@@ -1,236 +0,0 @@
-#! /bin/sh
-# Prepare files needed for flashing a Colibri VF50/VF61 module and
-# copy them to a convenient location for using from a running U-Boot
-
-set -e
-
-Flash()
-{
-	echo "To flash the Colibri VF50/VF61 module a running U-Boot is required. Boot the"
-	echo "module to the U-Boot prompt and"
-	echo ""
-	echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only"
-	echo "and enter:"
-	echo "'run setupdate'"
-	echo ""
-	echo "then to update all components enter:"
-	echo "'run update'"
-	echo ""
-	echo "Alternatively, to update U-Boot enter:"
-	echo "'run update_uboot'"
-	echo "to update a component stored in UBI enter:"
-	echo "'run prepare_ubi'"
-	echo "followed by one of:"
-	echo "'run update_kernel'"
-	echo "'run update_fdt'"
-	echo "'run update_rootfs'"
-	echo ""
-	echo ""
-	echo "If you don't have a working U-Boot anymore, connect your PC to the module's"
-	echo "UART, bring the module into the serial download mode and start the update.sh"
-	echo "script with the -d option. This will copy U-Boot into the module's RAM and"
-	echo "execute it. Don't forget to also bridge RTS/CTS if using an USB-to-serial"
-	echo "converter without handshake signals."
-	echo ""
-	echo "Then use the following command to get U-Boot running:"
-	echo "'./update.sh -n -d /dev/ttyUSB0'"
-	echo ""
-	echo "Next, recreate the Boot Configuration Block and the Toradex Config Block:"
-	echo "'run setupdate'"
-	echo "'run update_uboot'"
-	echo "'run create_bcb'"
-	echo "'cfgblock create'"
-}
-
-Usage()
-{
-	echo ""
-	echo "Prepares and copies files for flashing internal NAND of Colibri VF50/VF61"
-	echo ""
-	echo "The recommended way is to copy the files on a SD card or USB flash drive."
-	echo "The script format_sd.sh may be used to format the SD card."
-	echo ""
-	echo "The flash step requires a running U-Boot on the target. Either one already"
- 	echo "flashed on the NAND or downloaded using serial downloader (argument -d)."
-	echo ""
-	echo "-d uart_dev  : use UART connection to copy/execute U-Boot to/from module's RAM"
-	echo "-f           : flash instructions"
-	echo "-h           : prints this message"
-	echo "-m           : module type: 0: autodetect from ./rootfs/etc/issues (default)"
-	echo "                            1: Colibri VF50/VF61"
-	echo "-n           : disable hardware flow control (bridge RTS/CTS!)"
-	echo "-o directory : output directory"
-	echo "-s           : optimise file system for 128MB NAND, increases usable space"
-	echo "               on VF50 module a little, but on VF61 uses also only 128MB"
-	echo ""
-        echo "Example \"./update.sh -o /media/KERNEL/\" copies the required files to SD card"
-	echo ""
-	echo "*** For detailed recovery/update procedures, refer to the following website: ***"
-        echo "http://developer.toradex.com/knowledge-base/flashing-linux-on-vybrid-modules"
-	echo ""
-}
-
-# initialise options
-KERNEL_DEVICETREE="%kernel_device_trees%"
-KERNEL_IMAGETYPE="zImage"
-MODTYPE_DETECT=0
-NORTSCTS=0
-OUT_DIR=""
-UBOOT_RECOVERY=0
-# NAND parameters
-PAGE=2KiB
-BLOCK=124KiB
-MAXLEB=8112
-
-while getopts "d:fhm:no:s" Option ; do
-	case $Option in
-		d)	UBOOT_RECOVERY=1
-			UARTDEV=$OPTARG
-			;;
-		f)	Flash
-			exit 0
-			;;
-		h)	Usage
-			exit 0
-			;;
-		m)	MODTYPE_DETECT=$OPTARG
-			;;
-		n)	NORTSCTS=1
-			;;
-		o)	OUT_DIR=$OPTARG
-			;;
-		s)	MAXLEB=982
-			;;
-	esac
-done
-
-if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	Usage
-	exit 1
-fi
-
-# is OUT_DIR an existing directory?
-if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	echo "$OUT_DIR" "does not exist, exiting"
-	exit 1
-fi
-
-case $MODTYPE_DETECT in
-	0)	# auto detect MODTYPE from rootfs directory
-		if [ -f rootfs/etc/issue ] ; then
-			CNT=`grep -c "VF" rootfs/etc/issue || true`
-			if [ "$CNT" -ge 1 ] ; then
-				echo "Colibri VF rootfs detected"
-				MODTYPE=colibri-vf
-			fi
-		fi
-		if [ -e $MODTYPE ] ; then
-			echo "can not detect module type from ./rootfs/etc/issue"
-			echo "please specify the module type with the -m parameter"
-			echo "see help: '$ ./update.sh -h'"
-			echo "exiting"
-			exit 1
-		fi
-		;;
-	1)	MODTYPE=colibri-vf
-		echo "Colibri VF rootfs specified"
-		;;
-	*)	echo "-m paramter specifies an unknown value"
-		exit 1
-		;;
-esac
-
-case "$MODTYPE" in
-	"colibri-vf")
-		IMAGEFILE=ubifs.img
-		LOCPATH="vf_flash"
-		OUT_DIR="$OUT_DIR/colibri_vf"
-		;;
-	*)	echo "script internal error, unknown module type set"
-		exit 1
-		;;
-esac
-
-BINARIES=${MODTYPE}_bin
-
-#is only U-Boot to be copied to RAM?
-if [ "$UBOOT_RECOVERY" -eq 1 ] ; then
-	LOADEROPTS=""
-	if [ ${NORTSCTS} = 1 ]; then
-		LOADEROPTS="--no-rtscts"
-	fi
-
-	echo "Put the module in recovery mode and press [ENTER]..."
-	read RESULT
-	sudo ${LOCPATH}/imx_uart ${LOADEROPTS} ${UARTDEV} ${LOCPATH}/vybrid_usb_work.conf ${BINARIES}/u-boot.imx
-	exit
-fi
-
-#sanity check for correct untared rootfs
-DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'`
-if [ "${DEV_OWNER}x" != "rootx" ]
-then
-	printf "rootfs/dev is not owned by root, but it should!\n"
-	printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n"
-	printf "e.g. sudo tar xjvf Colibri_VF_LinuxImageV2.6_20160331.tar.bz2\n"
-	exit 1
-fi
-
-#sanity check, can we execute mkfs.ubifs, e.g. see the help text?
-CNT=`sudo $LOCPATH/mkfs.ubifs -h | grep -c space-fixup || true`
-if [ "$CNT" -eq 0 ] ; then
-	echo "The program mkfs.ubifs can not be executed or does not provide --space-fixup"
-	echo "option."
-	echo "Are you on a 64bit Linux host without installed 32bit execution environment?"
-	printf  "\033[1mPlease install e.g. ia32-libs on 64-bit Ubuntu\033[0m\n"
-	printf  "\033[1mMaybe others are needed e.g. liblzo2:i386 on 64-bit Ubuntu\033[0m\n"
-	exit 1
-fi
-
-#Install trap to write a sensible message in case any of the commands below
-#exit premature...
-trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT
-
-#Prepare full flashing
-sudo $LOCPATH/mkfs.ubifs --space-fixup -c ${MAXLEB} -e ${BLOCK} -m ${PAGE} -o ${BINARIES}/${IMAGEFILE} -r rootfs/ -v
-
-echo ""
-echo "UBI image of root file system generated, copying data to target folder..."
-
-#make a file with the used versions for U-Boot, kernel and rootfs
-sudo touch ${BINARIES}/versions.txt
-sudo chmod ugo+w ${BINARIES}/versions.txt
-echo "Component Versions" > ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/u-boot.imx`" >> ${BINARIES}/versions.txt
-ROOTFSVERSION=`grep VF rootfs/etc/issue || echo "Version Unknown"`
-echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt
-
-#create subdirectory for this module type
-sudo mkdir -p "$OUT_DIR"
-
-# Copy device tree file
-COPIED=false
-if test -n "${KERNEL_DEVICETREE}"; then
-	for DTB_FILE in ${KERNEL_DEVICETREE}; do
-		if [ -e "${BINARIES}/${DTB_FILE}" ]; then
-			sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/"
-			COPIED=true
-		fi
-	done
-	[ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}.  Aborting."; exit 1; }
-fi
-
-#copy to $OUT_DIR
-sudo cp ${BINARIES}/u-boot-nand.imx ${BINARIES}/zImage ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
-sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img"
-sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img"
-sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img"
-#cleanup intermediate files
-sudo rm ${BINARIES}/ubifs.img ${BINARIES}/versions.txt
-sync
-
-#Remove trap and report success!
-trap - EXIT
-printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n"
-
-Flash
diff --git a/recipes-images/images/files/library/create_configblock.sh b/recipes-images/images/files/library/create_configblock.sh
deleted file mode 100755
index 63e9951..0000000
--- a/recipes-images/images/files/library/create_configblock.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#! /bin/sh
-
-# exit on error
-set -e
-
-Usage()
-{
-	echo "create_configblock creates a configblock binary from the info on the module sticker."
-	echo "This can be used when the configblock got lost during a failed update attempt."
-	echo ""
-	echo "The created config-block will be copied to the choosen output directory when running"
-	echo "the update.sh command."
-	echo ""
-	echo "In order to write the config block enter on the U-Boot commandline:"
-	echo "run update"
-	echo "run update_configblock"
-	echo ""
-	echo "For Colibri VF modules the boot configuration block needs to be recreated first:"
-	echo "run update"
-	echo "run create_bcb"
-	echo "run update_configblock"
-	echo ""
-}
-
-while getopts "h" Option ; do
-        case $Option in
-                h) Usage
-                        # Exit if only usage (-h) was specfied.
-                        if [[ $# -eq 1 ]] ; then
-                                exit 10
-                        fi
-                        exit 0
-                        ;;
-        esac
-done
-
-#sanity check for some programs
-AWKTEST=`echo 12345678abcdefgh | awk 'BEGIN{ FIELDWIDTHS = "8 8"} {print $2}'` || true
-[ "${AWKTEST}x" = "abcdefghx" ] || { echo >&2 "Program gawk not available.  Aborting."; exit 1; }
-
-# autotect MODTYPE from from rootfs directory
-CNT=`grep -c "VF" rootfs/etc/issue || true`
-if [ "$CNT" -ge 1 ] ; then
-	echo "Colibri VF rootfs detected"
-	MODTYPE=colibri-vf
-else
-	CNT=`grep -c "Colibri_iMX6" rootfs/etc/issue || true`
-	if [ "$CNT" -ge 1 ] ; then
-		echo "Colibri iMX6 rootfs detected"
-		MODTYPE=colibri-imx6
-	else
-		CNT=`grep -ic "imx6" rootfs/etc/issue || true`
-		if [ "$CNT" -ge 1 ] ; then
-			echo "Apalis iMX6 rootfs detected"
-			MODTYPE=apalis-imx6
-		else
-			echo "can not detect modulue type from ./rootfs/etc/issue"
-			echo "exiting"
-			exit 1
-		fi
-	fi
-fi
-
-echo "Enter the modules serial number on the modules sticker or"
-echo "use a barcode scanner to enter the content of the stickers barcode"
-
-# read a barcode and test it to be 8 or 16 numbers only 0025100102489109 0115100000000024
-#                                                       1234567890123456 1234567890123456
-until [ "${BARCODE}x" != "x" ]
-do
-	read BARCODE
-	#remove all whitespace
-	BARCODE=`echo $BARCODE | tr -d ' '`	
-	#get strlen and the number of numeric characters
-	STRLEN=`echo $BARCODE  | wc -c`
-	NUMCNT=`echo $BARCODE | sed 's/[^0-9]//g' | wc -c`
-	if [ $STRLEN -ne 17 ] ; then 
-		if [ $STRLEN -ne 9 ] ; then
-			echo "The serial number must be 8 numbers long (the barcode 16)"
-			BARCODE=""
-		fi
-	fi
-	if [ $NUMCNT -ne $STRLEN ] ; then
-		echo "The serial number must contain all numeric characters"
-		BARCODE=""
-	fi
-done
-DATECODE=19700101000000
-if [ $STRLEN -eq 17 ] ; then
-	SERIALNR=`echo $BARCODE | awk 'BEGIN{ FIELDWIDTHS = "8 8"} {print $2}'`
-	PRODUCTNR=`echo $BARCODE | awk 'BEGIN{ FIELDWIDTHS = "8 8"} {print $1}'`
-else
-	SERIALNR=$BARCODE
-	case ${MODTYPE} in
-	"apalis-imx6")
-		RAM_SIZE=1024
-		echo "Enter the RAM size ( 512 / 1024 / 2048 ):"
-		read RAM_SIZE
-		case ${RAM_SIZE} in
-		"512")
-			PROD_ID="0029"
-			;;
-		"1024") 
-			PROD_ID="0027"
-			;;
-		"2048")
-			PROD_ID="0028"
-			;;
-		esac
-		;;
-	"colibri-imx6")
-		RAM_SIZE=256
-		echo "Enter the RAM size ( 256 / 512 ):"
-		read RAM_SIZE
-		echo "Enter I for IT version, nothing otherwise"
-		read IT
-		if [ $RAM_SIZE -eq 512 ] ; then
-			if [ "$IT"x = "Ix" ] ; then
-				PROD_ID="0017"
-			else
-				PROD_ID="0015"
-			fi
-		else
-			if [ "$IT"x = "Ix" ] ; then
-				PROD_ID="0016"
-			else
-				PROD_ID="0014"
-			fi
-		fi
-		;;
-	"colibri-vf")
-		VF_TYPE=50
-		echo "Enter the Module Type (50 for a Colibri VF50 or 61 for a Colibri VF61)"
-		read VF_TYPE
-
-		echo "Enter I for IT version, nothing otherwise"
-		read IT
-		if [ "$VF_TYPE" = "50" ] ; then
-			if [ "$IT"x = "Ix" ] ; then
-				PROD_ID="0013"
-			else
-				PROD_ID="0010"
-			fi
-		elif [ "$VF_TYPE" = "61" ] ; then
-			if [ "$IT"x = "I"x ] ; then
-				PROD_ID="0012"
-			else
-				PROD_ID="0011"
-			fi
-		fi
-		;;
-	esac
-
-	echo "Enter the module version, e.g. V1.2 C"
-	read PRODVERSION
-	VER_MAJ=`echo $PRODVERSION | awk 'BEGIN{ FIELDWIDTHS = "1 1 1 1 1 1"} {print $2}'`
-	VER_MIN=`echo $PRODVERSION | awk 'BEGIN{ FIELDWIDTHS = "1 1 1 1 1 1"} {print $4}'`
-	#VARIANT: A=0, B=1 ...
-	VARIANT=`echo $PRODVERSION | awk 'BEGIN{ FIELDWIDTHS = "1 1 1 1 1 1"} {print $6}'`
-	VARIANT=`printf "%d\n" "'$VARIANT"`
-	VARIANT=`expr $VARIANT - 65`
-	if [ "$VARIANT" -lt 10 ] ; then
-		VARIANT=0$VARIANT
-	fi
-	PRODUCTNR=${PROD_ID}${VER_MAJ}${VER_MIN}${VARIANT}
-fi
-
-#write the config block file
-CONFIGBLOCK_FILE=${MODTYPE}_bin/configblock.bin
-sudo chown ${USER}: `dirname $CONFIGBLOCK_FILE`
-sudo rm -f $CONFIGBLOCK_FILE
-#file header
-awk 'function sc(c) {return (c<128?c:(c-256))} BEGIN{printf "%c%c%c%c",0,64,1,-49}' > $CONFIGBLOCK_FILE
-#mac addr / serial
-echo $SERIALNR | awk 'function sc(c) {return (c<128?c:(c-256))} {printf "%c%c%c%c%c%c%c%c%c%c%c%c",2,64,0,0, 0,20,45, sc(int($0/256/256)), sc(int($0/256)%256), sc($0%256),0,0 }' >> $CONFIGBLOCK_FILE
-#product describtion, $1 char 0/1: ??, $2 char 2/3: ProdID, $3 char 4:VerMaj, $4 char 5:VerMin, $5 char 6/7:Variant
-echo $PRODUCTNR | awk 'BEGIN{ FIELDWIDTHS = "2 2 1 1 2"} function sc(c) {return (c<128?c:(c-256))} {printf "%c%c%c%c%c%c%c%c%c%c%c%c",2,64,8,0 ,sc($3),0, sc($4),0, sc($5),0, sc($2),0 }' >> $CONFIGBLOCK_FILE
-#fill to 32 bytes
-awk 'function sc(c) {return (c<128?c:(c-256))} BEGIN{printf "%c%c%c%c",-1,-1,-1,-1}' >> $CONFIGBLOCK_FILE
-
-exit 0
diff --git a/recipes-images/images/files/library/fwd_blk.scr b/recipes-images/images/files/library/fwd_blk.scr
deleted file mode 100644
index 0c961dd..0000000
--- a/recipes-images/images/files/library/fwd_blk.scr
+++ /dev/null
@@ -1,10 +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_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/recipes-images/images/files/library/fwd_eth.scr b/recipes-images/images/files/library/fwd_eth.scr
deleted file mode 100644
index d7ea35c..0000000
--- a/recipes-images/images/files/library/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/recipes-images/images/files/library/fwd_mmc.scr b/recipes-images/images/files/library/fwd_mmc.scr
deleted file mode 100644
index 4c8f666..0000000
--- a/recipes-images/images/files/library/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/recipes-images/images/files/library/genext3fs.sh b/recipes-images/images/files/library/genext3fs.sh
deleted file mode 100755
index 25f7a85..0000000
--- a/recipes-images/images/files/library/genext3fs.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#creates a file containing a ext3 binary blob of the content of the ../rootfs folder
-
-# sometimes we need the binary echo, not the shell builtin
-ECHO=`which echo`
-
-MOUNTPOINT="mnt/tdx-rootfs"
-
-Usage()
-{
-	echo "creates a file containing a ext3 binary blob. Output file name taken from command line"
-	echo "Usage: genext3fs.sh [OPTION]... dest_file_name"
-	echo "-h : Prints this message"
-	echo "-b : Sets the partition size in MBytes, default 256"
-	echo "-d : Selects the directory which contains the partition content, default ../rootfs"
-	echo ""
-}
-
-PARTITIONSIZE=256
-SRCPATH=../rootfs
-
-while getopts "b:d:h" Option ; do
-	case $Option in
-		h) Usage
-			# Exit if only usage (-h) was specfied.
-			if [[ "$#" -eq "1" ]] ; then
-				exit 10
-			fi
-			exit 0
-			;;
-		b) PARTITIONSIZE=$OPTARG
-			;;
-		d) SRCPATH=$OPTARG
-			;;
-	esac
-done
-#adjust the commandline arg for the now used options
-shift $(($OPTIND - 1))
-
-#create the file used for the loopbackdevice and format it for ext3
-#answer y to "is not a block special device"
-dd if=/dev/zero of=$@ bs=1024k count=$PARTITIONSIZE
-mkfs.ext3 -F -L rootfs $@
-#disable fsck checks based on mount count or time interval
-tune2fs -c 0 -i 0 $@
-
-#prepare mountpoint for the loopdevice 
-sudo mkdir -p $MOUNTPOINT
-sudo umount $MOUNTPOINT &> /dev/null
-sudo rm -rf $MOUNTPOINT/*
-#mount the file as a loopdevice 
-#there seems to be a race between mkfs.ext3 not yet finished and mount already trying to mount, so try until it works
-MOUNTED=0
-while [ "$MOUNTED" -eq  "0" ] ; do
-	sync
-	sleep 1
-	sudo mount $@ $MOUNTPOINT/ -o loop -t ext3
-	MOUNTED=`mount | grep -c "$MOUNTPOINT"`
-done
-#extract rootfs into the file
-sudo cp -a $SRCPATH/* $MOUNTPOINT
-if [ "$?" -ne "0" ] ; then
-	$ECHO -e "\033[1mCopying the rootfs failed.\033[0m"
-	echo "Check for error messages from cp"
-	sudo rm $@
-	exit 1
-fi
-
-#unmount again
-sudo umount $MOUNTPOINT
-
-#if the mounting was unsuccesful all rootfs data now still is in MOUNTPOINT, and $@ contains an empty fs
-#delete $@ in that case to fail early
-sync
-FAILED=`ls $MOUNTPOINT | wc -l`
-if [ "$FAILED" -ne "0" ] ; then
-	$ECHO -e "\033[1mMounting the loopdevice $@ failed.\033[0m"
-	sudo rm $@
-	exit 1
-fi
diff --git a/recipes-images/images/files/library/genext4fs.sh b/recipes-images/images/files/library/genext4fs.sh
deleted file mode 100755
index 9ce6735..0000000
--- a/recipes-images/images/files/library/genext4fs.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#creates a file containing a ext4 binary blob of the content of the ../rootfs folder
-
-# sometimes we need the binary echo, not the shell builtin
-ECHO=`which echo`
-
-MOUNTPOINT="mnt/tdx-rootfs"
-
-Usage()
-{
-	echo "creates a file containing a ext4 binary blob. Output file name taken from command line"
-	echo "Usage: genext4fs.sh [OPTION]... dest_file_name"
-	echo "-h : Prints this message"
-	echo "-b : Sets the partition size in MBytes, default 256"
-	echo "-d : Selects the directory which contains the partition content, default ../rootfs"
-	echo ""
-}
-
-PARTITIONSIZE=256
-SRCPATH=../rootfs
-
-while getopts "b:d:h" Option ; do
-	case $Option in
-		h) Usage
-			# Exit if only usage (-h) was specfied.
-			if [[ "$#" -eq "1" ]] ; then
-				exit 10
-			fi
-			exit 0
-			;;
-		b) PARTITIONSIZE=$OPTARG
-			;;
-		d) SRCPATH=$OPTARG
-			;;
-	esac
-done
-#adjust the commandline arg for the now used options
-shift $(($OPTIND - 1))
-
-#create the file used for the loopbackdevice and format it for ext4
-#answer y to "is not a block special device"
-dd if=/dev/zero of=$@ bs=1024k count=$PARTITIONSIZE
-mkfs.ext4 -F -L rootfs $@
-#disable fsck checks based on mount count or time interval
-tune2fs -c 0 -i 0 $@
-
-#prepare mountpoint for the loopdevice
-sudo mkdir -p $MOUNTPOINT
-sudo umount $MOUNTPOINT &> /dev/null
-sudo rm -rf $MOUNTPOINT/*
-#mount the file as a loopdevice
-#there seems to be a race between mkfs.ext4 not yet finished and mount already trying to mount, so try until it works
-MOUNTED=0
-while [ "$MOUNTED" -eq  "0" ] ; do
-	sync
-	sleep 1
-	sudo mount $@ $MOUNTPOINT/ -o loop -t ext4
-	MOUNTED=`mount | grep -c "$MOUNTPOINT"`
-done
-#extract rootfs into the file
-sudo cp -a $SRCPATH/* $MOUNTPOINT
-if [ "$?" -ne "0" ] ; then
-	$ECHO -e "\033[1mCopying the rootfs failed.\033[0m"
-	echo "Check for error messages from cp"
-	sudo rm $@
-	exit 1
-fi
-
-#unmount again
-sudo umount $MOUNTPOINT
-
-#if the mounting was unsuccesful all rootfs data now still is in MOUNTPOINT, and $@ contains an empty fs
-#delete $@ in that case to fail early
-sync
-FAILED=`ls $MOUNTPOINT | wc -l`
-if [ "$FAILED" -ne "0" ] ; then
-	$ECHO -e "\033[1mMounting the loopdevice $@ failed.\033[0m"
-	sudo rm $@
-	exit 1
-fi
diff --git a/recipes-images/images/files/library/imx6/flash_blk.scr b/recipes-images/images/files/library/imx6/flash_blk.scr
deleted file mode 100644
index 12d89cf..0000000
--- a/recipes-images/images/files/library/imx6/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/recipes-images/images/files/library/imx6/flash_eth.scr b/recipes-images/images/files/library/imx6/flash_eth.scr
deleted file mode 100644
index ee91523..0000000
--- a/recipes-images/images/files/library/imx6/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'
diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh
deleted file mode 100755
index dc5e0dd..0000000
--- a/recipes-images/images/files/library/imx6/update.sh
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-# Prepare files needed for flashing a Apalis/Colibri iMX6 module
-#
-# inspired by meta-fsl-arm/classes/image_types_fsl.bbclass
-
-# exit on error
-set -e
-
-Flash()
-{
-	echo "To flash the Apalis/Colibri iMX6 module a running U-Boot is required. Boot the"
-	echo "module to the U-Boot prompt and"
-	echo ""
-	echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only"
-	echo "and enter:"
-	echo "'run setupdate'"
-	echo ""
-	echo "then to update all components enter:"
-	echo "'run update'"
-	echo ""
-	echo "to update a single component enter one of:"
-	echo "'run update_uboot'"
-	echo "'run update_kernel'"
-	echo "'run update_fdt'"
-	echo "'run update_rootfs'"
-	echo ""
-	echo "If you don't have a working U-Boot anymore, connect your PC to the module's USB"
-	echo "client port, bring the module in the serial download mode and start the"
-	echo "update.sh script with the -d option. This will copy U-Boot into the modules RAM"
-	echo "and execute it."
-}
-
-Usage()
-{
-	echo ""
-	echo "Prepares and copies files for flashing internal eMMC of Apalis/Colibri iMX6"
-	echo ""
-	echo "Will require a running U-Boot on the target. Either one already flashed on the"
-	echo "eMMC or one copied over USB into the module's RAM"
-	echo ""
-	echo "-d           : use USB connection to copy/execute U-Boot to/from module's RAM"
-	echo "-f           : flash instructions"
-	echo "-h           : prints this message"
-	echo "-m           : module type: 0: autodetect from ./rootfs/etc/issues (default)"
-	echo "                            1: Apalis iMX6"
-	echo "                            2: Colibri iMX6"
-	echo "-o directory : output directory"
-	echo ""
-	echo "Example \"./update.sh -o /srv/tftp/\" copies the required files to /srv/tftp/"
-	echo ""
-	echo "*** For detailed recovery/update procedures, refer to the following website: ***"
-        echo "http://developer.toradex.com/knowledge-base/flashing-linux-on-imx6-modules"
-	echo ""
-}
-
-# initialise options
-KERNEL_IMAGETYPE="zImage"
-MIN_PARTITION_FREE_SIZE=100
-MODTYPE_DETECT=0
-OUT_DIR=""
-ROOTFSPATH=rootfs
-SPLIT=1
-UBOOT_RECOVERY=0
-U_BOOT_BINARY=u-boot.img
-SPL_BINARY=SPL
-
-while getopts "dfhm:o:" Option ; do
-	case $Option in
-		d)	UBOOT_RECOVERY=1
-			;;
-		f)	Flash
-			exit 0
-			;;
-		h)	Usage
-			exit 0
-			;;
-		m)	MODTYPE_DETECT=$OPTARG
-			;;
-		o)	OUT_DIR=$OPTARG
-			;;
-	esac
-done
-
-if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	Usage
-	exit 1
-fi
-
-# is OUT_DIR an existing directory?
-if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	echo "$OUT_DIR" "does not exist, exiting"
-	exit 1
-fi
-
-case $MODTYPE_DETECT in
-	0)	# auto detect MODTYPE from rootfs directory
-		if [ -f rootfs/etc/issue ] ; then
-			CNT=`grep -ic "Colibri.iMX6" rootfs/etc/issue || true`
-			if [ "$CNT" -ge 1 ] ; then
-				echo "Colibri iMX6 rootfs detected"
-				MODTYPE=colibri-imx6
-			else
-				CNT=`grep -ic "imx6" rootfs/etc/issue || true`
-				if [ "$CNT" -ge 1 ] ; then
-					echo "Apalis iMX6 rootfs detected"
-					MODTYPE=apalis-imx6
-				fi
-			fi
-		fi
-		if [ -e $MODTYPE ] ; then
-			echo "can not detect module type from ./rootfs/etc/issue"
-			echo "please specify the module type with the -m parameter"
-			echo "see help: '$ ./update.sh -h'"
-			echo "exiting"
-			exit 1
-		fi
-		;;
-	1)	MODTYPE=apalis-imx6
-		echo "Apalis iMX6 rootfs specified"
-		;;
-	2)	MODTYPE=colibri-imx6
-		echo "Colibri iMX6 rootfs specified"
-		;;
-	*)	echo "-m paramter specifies an unknown value"
-		exit 1
-		;;
-esac
-
-case "$MODTYPE" in
-	"apalis-imx6")
-		# assumed minimal eMMC size [in sectors of 512]
-		EMMC_SIZE=$(expr 1024 \* 3500 \* 2)
-		IMAGEFILE=root.ext4
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		LOCPATH="`pwd`/imx_flash"
-		OUT_DIR="$OUT_DIR/apalis_imx6"
-		;;
-	"colibri-imx6")
-		# assumed minimal eMMC size [in sectors of 512]
-		EMMC_SIZE=$(expr 1024 \* 3500 \* 2)
-		IMAGEFILE=root.ext4
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		LOCPATH="`pwd`/imx_flash"
-		OUT_DIR="$OUT_DIR/colibri_imx6"
-		;;
-	*)	echo "script internal error, unknown module type set"
-		exit 1
-		;;
-esac
-
-BINARIES=${MODTYPE}_bin
-
-#is only U-Boot to be copied to RAM?
-if [ "$UBOOT_RECOVERY" -ge 1 ] ; then
-	cd ${BINARIES}
-	# do a load chain of first loading SPL then u-boot.img
-	sudo ${LOCPATH}/imx_usb
-	exit
-fi
-
-#sanity check for awk programs
-AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true
-[ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available.  Aborting."; exit 1; }
-
-#sanity check for correct untared rootfs
-DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'`
-if [ "${DEV_OWNER}x" != "rootx" ]
-then
-	printf "rootfs/dev is not owned by root, but it should!\n"
-	printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n"
-	printf "e.g. sudo tar xjvf Apalis_iMX6_LinuxImageV2.6_20160331.tar.bz2\n"
-	exit 1
-fi
-
-#sanity check for existence of U-Boot and kernel
-[ -e ${BINARIES}/${U_BOOT_BINARY} ] || { echo "${BINARIES}/${U_BOOT_BINARY} does not exist"; exit 1; }
-[ -e ${BINARIES}/${SPL_BINARY} ] || { echo "${BINARIES}/${SPL_BINARY} does not exist"; exit 1; }
-[ -e ${BINARIES}/${KERNEL_IMAGETYPE} ] || { echo "${BINARIES}/${KERNEL_IMAGETYPE} does not exist"; exit 1; }
-
-#Sanity check for some programs. Some distros have fs tools only in root's path
-MCOPY=`command -v mcopy` || { echo >&2 "Program mcopy not available.  Aborting."; exit 1; }
-PARTED=`command -v parted` || PARTED=`sudo -s command -v parted` || { echo >&2 "Program parted not available.  Aborting."; exit 1; }
-MKFSVFAT=`command -v mkfs.fat` || MKFSVFAT=`sudo -s command -v mkfs.fat` || { echo >&2 "Program mkfs.fat not available.  Aborting."; exit 1; }
-MKFSEXT4=`command -v mkfs.ext4` || MKFSEXT4=`sudo -s command -v mkfs.ext4` || { echo >&2 "Program mkfs.ext4 not available.  Aborting."; exit 1; }
-dd --help >/dev/null 2>&1 || { echo >&2 "Program dd not available.  Aborting."; exit 1; }
-
-#Install trap to write a sensible message in case any of the commands below
-#exit premature...
-trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT
-
-#make the directory with the outputfiles writable
-sudo chown $USER: ${BINARIES}
-
-#make a file with the used versions for U-Boot, kernel and rootfs
-sudo touch ${BINARIES}/versions.txt
-sudo chmod ugo+w ${BINARIES}/versions.txt
-echo "Component Versions" > ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${U_BOOT_BINARY}`" >> ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${SPL_BINARY}`" >> ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${KERNEL_IMAGETYPE}`" >> ${BINARIES}/versions.txt
-ROOTFSVERSION=`grep -i imx6 rootfs/etc/issue || echo "Version Unknown"`
-echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt
-
-#create subdirectory for this module type
-sudo mkdir -p "$OUT_DIR"
-
-# The eMMC layout used is:
-#
-# boot area partition 1 aka primary eMMC boot sector:
-# with U-Boot boot loader and the U-Boot environment before the configblock at
-# the end of that boot area partition
-#
-# boot area partition 2 aka secondary eMMC boot sector:
-# reserved
-#
-# user area aka general purpose eMMC region:
-#
-#    0                      -> IMAGE_ROOTFS_ALIGNMENT         - reserved (not partitioned)
-#    IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE                     - kernel and other data
-#    BOOT_SPACE             -> SDIMG_SIZE                     - rootfs
-#
-#            4MiB               16MiB           SDIMG_ROOTFS
-# <-----------------------> <----------> <---------------------->
-#  ------------------------ ------------ ------------------------
-# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE            |
-#  ------------------------ ------------ ------------------------
-# ^                        ^            ^                        ^
-# |                        |            |                        |
-# 0                      4MiB      4MiB + 16MiB              EMMC_SIZE
-
-
-# Boot partition [in sectors of 512]
-BOOT_START=$(expr 4096 \* 2)
-# Rootfs partition [in sectors of 512]
-ROOTFS_START=$(expr 20480 \* 2)
-# Boot partition volume id
-BOOTDD_VOLUME_ID="boot"
-
-echo ""
-echo "Creating MBR file and do the partitioning"
-# Initialize a sparse file
-dd if=/dev/zero of=${BINARIES}/mbr.bin bs=512 count=0 seek=${EMMC_SIZE}
-${PARTED} -s ${BINARIES}/mbr.bin mklabel msdos
-${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary fat32 ${BOOT_START} $(expr ${ROOTFS_START} - 1 )
-# the partition spans to the end of the disk, even though the fs size will be smaller
-# on the target the fs is then grown to the full size
-${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext4 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1)
-${PARTED} -s ${BINARIES}/mbr.bin unit s print 
-# get the size of the VFAT partition
-BOOT_BLOCKS=$(LC_ALL=C ${PARTED} -s ${BINARIES}/mbr.bin unit b print \
-	| awk '/ 1 / { print int(substr($4, 1, length($4 -1)) / 1024) }')
-# now crop the file to only the MBR size
-IMG_SIZE=512
-truncate -s $IMG_SIZE ${BINARIES}/mbr.bin
-
-
-echo ""
-echo "Creating VFAT partition image with the kernel"
-rm -f ${BINARIES}/boot.vfat
-${MKFSVFAT} -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${BINARIES}/boot.vfat $BOOT_BLOCKS 
-export MTOOLS_SKIP_CHECK=1
-mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${KERNEL_IMAGETYPE} ::/${KERNEL_IMAGETYPE}
-
-# Copy device tree file
-COPIED=false
-if test -n "${KERNEL_DEVICETREE}"; then
-	for DTB_FILE in ${KERNEL_DEVICETREE}; do
-		if [ -e "${BINARIES}/${DTB_FILE}" ]; then
-			mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${DTB_FILE} ::/${DTB_FILE}
-			#copy also to out_dir
-			sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/"
-			COPIED=true
-		fi
-	done
-	[ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}.  Aborting."; exit 1; }
-fi
-
-echo ""
-echo "Creating rootfs partition image"
-#make the filesystem size size(rootfs used + MIN_PARTITION_FREE_SIZE)
-#add about 4% to the rootfs to account for fs overhead. (/1024/985 instead of /1024/1024).
-#add 512 bytes per file to account for small files
-#(resize it later on target to fill the size of the partition it lives in)
-NUMBER_OF_FILES=`sudo find ${ROOTFSPATH} | wc -l`
-EXT_SIZE=`sudo du -DsB1 ${ROOTFSPATH} | awk -v min=$MIN_PARTITION_FREE_SIZE -v f=${NUMBER_OF_FILES} \
-		'{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'`
-rm -f ${BINARIES}/${IMAGEFILE}
-sudo $LOCPATH/genext4fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1
-
-
-#copy to $OUT_DIR
-sudo cp ${BINARIES}/${U_BOOT_BINARY} ${BINARIES}/${SPL_BINARY} ${BINARIES}/${KERNEL_IMAGETYPE} ${BINARIES}/mbr.bin \
-	${BINARIES}/boot.vfat ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
-sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img"
-sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img"
-sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img"
-
-if [ "$SPLIT" -ge 1 ] ; then
-sudo split -a 3 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=100 ${BINARIES}/${IMAGEFILE} "$OUT_DIR/root.ext4-"
-fi
-
-#cleanup intermediate files
-sudo rm ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/versions.txt
-sync
-
-#Remove trap and report success!
-trap - EXIT
-printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n"
-
-Flash
diff --git a/recipes-images/images/files/library/mk-u-boot-scripts.sh b/recipes-images/images/files/library/mk-u-boot-scripts.sh
deleted file mode 100755
index dda47d5..0000000
--- a/recipes-images/images/files/library/mk-u-boot-scripts.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-for f in *.scr
-do
-	mkimage -T script -C none -n 'Flash Apalis/Colibri module' -d $f `basename $f .scr`.img
-done	
diff --git a/recipes-images/images/files/library/tegra/update.sh b/recipes-images/images/files/library/tegra/update.sh
deleted file mode 100755
index cb55dfc..0000000
--- a/recipes-images/images/files/library/tegra/update.sh
+++ /dev/null
@@ -1,477 +0,0 @@
-#!/bin/sh
-# Prepare files needed for flashing an Apalis/Colibri T20/T30/TK1 module and
-# copy them to a convenient location for using from a running U-Boot
-
-# exit on error
-set -e
-
-Flash()
-{
-	echo "To flash the Apalis/Colibri T20/T30/TK1 module a running U-Boot is required. Boot"
-	echo "the module to the U-Boot prompt and"
-	echo ""
-	echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only"
-	echo "and enter:"
-	echo "'run setupdate'"
-	echo ""
-	echo "then to update all components enter:"
-	echo "'run update'"
-	echo ""
-	echo "Alternatively, to update U-Boot enter:"
-	echo "'run update_uboot'"
-	echo "to update a component stored in UBI enter:"
-	echo "'run prepare_ubi' (for Colibri T20)"
-	echo "followed by one of:"
-	echo "'run update_kernel'"
-	echo "'run update_fdt' (for device tree enabled kernels)"
-	echo "'run update_rootfs'"
-	echo ""
-	echo ""
-	echo "If you don't have a working U-Boot anymore, connect your PC to the module's USB"
-	echo "client port, bring the module into the recovery mode and start the update.sh"
-	echo "script with the -d option. This will copy U-Boot into the module's RAM and"
-	echo "execute it."
-}
-
-Usage()
-{
-	echo ""
-	echo "Prepares and copies files for flashing internal eMMC/NAND of Apalis T30/TK1 and"
-	echo "Colibri T20/T30"
-	echo ""
-	echo "Will require a running U-Boot on the target. Either one already flashed on the"
-	echo "eMMC/NAND or one copied over USB into the module's RAM"
-	echo ""
-	echo "-b           : T20: selects boot device (hsmmc/nand) (default: nand)"
-	echo "-d           : use USB recovery mode to copy/execute U-Boot to/from module's RAM"
-	echo "-f           : flash instructions"
-	echo "-h           : prints this message"
-	echo "-m           : module type: 0: autodetect from ./rootfs/etc/issues (default)"
-	echo "                            1: Apalis T30"
-	echo "                            2: Apalis TK1"
-	echo "                            3: Colibri T20"
-	echo "                            4: Colibri T30"
-	echo "-o directory : output directory"
-	echo "-r           : T20 recovery mode: select RAM size (256 | 512)"
-	echo "-s           : T20: optimise file system for V1.1 or 256MB V1.2 modules,"
-	echo "               increases usable space a little, but limits 512MB V1.2 modules"
-	echo "               to 512MB usable NAND space"
-	echo "-v           : T20 recovery mode: select Colibri version (V1_1 | V1_2)"
-	echo ""
-	echo "Example \"./update.sh -o /srv/tftp/\" copies the required files to /srv/tftp/"
-	echo ""
-	echo "*** For detailed recovery/update procedures, refer to the following website: ***"
-        echo "http://developer.toradex.com/knowledge-base/flashing-linux-on-tegra-modules"
-	echo ""
-}
-
-# initialise options
-BOOT_DEVICE=nand
-EMMC_PARTS="mbr.bin boot.vfat" 
-# no devicetree by default
-KERNEL_DEVICETREE=""
-KERNEL_IMAGETYPE="zImage"
-MIN_PARTITION_FREE_SIZE=300
-MODTYPE_DETECT=0
-
-# NAND parameters
-BLOCK="248KiB 504KiB"
-MAXLEB=4084
-PAGE="4KiB"
-
-OUT_DIR=""
-ROOTFSPATH=rootfs
-SPLIT=1
-UBOOT_RECOVERY=0
-
-# don't provide working defaults which may lead to wrong HW/SW combination
-MODVERSION=Add_Version_-v
-RAM_SIZE=Add_RAMsize_-r
-
-while getopts "b:dfhm:o:r:sv:" Option ; do
-	case $Option in
-		b)	BOOT_DEVICE=$OPTARG
-			;;
-		d)	UBOOT_RECOVERY=1
-			;;
-		f)	Flash
-			exit 0
-			;;
-		h)	Usage
-			exit 0
-			;;
-		m)	MODTYPE_DETECT=$OPTARG
-			;;
-		o)	OUT_DIR=$OPTARG
-			;;
-		r)	RAM_SIZE=$OPTARG
-			;;
-		s)	MAXLEB=2042
-			;;
-		v)	if [ "${OPTARG}" = "V1_1" ] ; then MODVERSION=v11; fi
-			if [ "${OPTARG}" = "V1_2" ] ; then MODVERSION=v12; fi
-			;;
-	esac
-done
-
-if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	Usage
-	exit 1
-fi
-
-# is OUT_DIR an existing directory?
-if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then
-	echo "$OUT_DIR" "does not exist, exiting"
-	exit 1
-fi
-
-case $MODTYPE_DETECT in
-	0)	# auto detect MODTYPE from rootfs directory
-		if [ -f rootfs/etc/issue ] ; then
-			CNT=`grep -ic "apalis" rootfs/etc/issue || true`
-			if [ "$CNT" -ge 1 ] ; then
-				CNT=`grep -ic "t30" rootfs/etc/issue || true`
-				if [ "$CNT" -ge 1 ] ; then
-					echo "Apalis T30 rootfs detected"
-					MODTYPE=apalis-t30
-				else
-					CNT=`grep -ic "tk1" rootfs/etc/issue || true`
-					if [ "$CNT" -ge 1 ] ; then
-						echo "Apalis TK1 rootfs detected"
-						MODTYPE=apalis-tk1
-
-						CNT=`grep -ic "mainline" rootfs/etc/issue || true`
-						if [ "$CNT" -ge 1 ] ; then
-							echo "Mainline variant"
-							MODTYPE=apalis-tk1-mainline
-						fi
-					fi
-
-				fi
-			else
-				CNT=`grep -ic "colibri" rootfs/etc/issue || true`
-				if [ "$CNT" -ge 1 ] ; then
-					CNT=`grep -ic "t20" rootfs/etc/issue || true`
-					if [ "$CNT" -ge 1 ] ; then
-						echo "Colibri T20 rootfs detected"
-						MODTYPE=colibri-t20
-					else
-						CNT=`grep -ic "t30" rootfs/etc/issue || true`
-						if [ "$CNT" -ge 1 ] ; then
-							echo "Colibri T30 rootfs detected"
-							MODTYPE=colibri-t30
-						fi
-					fi
-				fi
-			fi
-		fi
-		if [ -e $MODTYPE ] ; then
-			echo "can not detect module type from ./rootfs/etc/issue"
-			echo "please specify the module type with the -m parameter"
-			echo "see help: '$ ./update.sh -h'"
-			echo "exiting"
-			exit 1
-		fi
-		;;
-	1)	MODTYPE=apalis-t30
-		echo "Apalis T30 rootfs specified"
-		;;
-	2)	MODTYPE=apalis-tk1
-		echo "Apalis TK1 rootfs specified"
-		;;
-	3)	MODTYPE=colibri-t20
-		echo "Colibri T20 rootfs specified"
-		;;
-	4)	MODTYPE=colibri-t30
-		echo "Colibri T30 rootfs specified"
-		;;
-	*)	echo "-m paramter specifies an unknown value"
-		exit 1
-		;;
-esac
-
-case "$MODTYPE" in
-	"apalis-t30")
-                # note: requires changing apalis-t30_bin/apalis_t30.img.cfg as well
-#		BCT=apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct
-		BCT=Apalis_T30_2GB_800Mhz.bct
-		CBOOT_IMAGE=apalis_t30.img
-		CBOOT_IMAGE_TARGET=tegra30
-		# assumed minimal eMMC size [in sectors of 512]
-		EMMC_SIZE=$(expr 1024 \* 7450 \* 2)
-		IMAGEFILE=root.ext3
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		LOCPATH="tegra-uboot-flasher"
-		OUT_DIR="$OUT_DIR/apalis_t30"
-		U_BOOT_BINARY=u-boot-dtb-tegra.bin
-		;;
-    "apalis-tk1" | "apalis-tk1-mainline")
-		BCT=PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct
-		CBOOT_IMAGE=apalis-tk1.img
-		CBOOT_IMAGE_TARGET=tegra124
-		# assumed minimal eMMC size [in sectors of 512]
-		EMMC_SIZE=$(expr 1024 \* 15020 \* 2)
-		IMAGEFILE=root.ext4
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		LOCPATH="tegra-uboot-flasher"
-		OUT_DIR="$OUT_DIR/apalis-tk1"
-		U_BOOT_BINARY=u-boot-dtb-tegra.bin
-		;;
-	"colibri-t20")
-		BCT=colibri_t20-${RAM_SIZE}-${MODVERSION}-${BOOT_DEVICE}.bct
-		CBOOT_IMAGE="colibri_t20-256-v11-nand.img colibri_t20-256-v12-nand.img colibri_t20-512-v11-nand.img colibri_t20-512-v12-nand.img"
-		CBOOT_IMAGE_TARGET=tegra20
-		EMMC_PARTS=""
-		IMAGEFILE=ubifs
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		KERNEL_IMAGETYPE="zImage"
-		LOCPATH="tegra-uboot-flasher"
-		OUT_DIR="$OUT_DIR/colibri_t20"
-		U_BOOT_BINARY=u-boot-dtb-tegra.bin
-		;;
-	"colibri-t30")
-		# with new kernel, boot with 400MHz, then switch between 400 & 800
-		# note: requires changing colibri-t30_bin/colibri_t30.img.cfg as well
-		BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct
-#		BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct
-		CBOOT_IMAGE=colibri_t30.img
-		CBOOT_IMAGE_TARGET=tegra30
-		EMMC_SIZE=$(expr 1024 \* 3640 \* 2)
-		IMAGEFILE=root.ext3
-		KERNEL_DEVICETREE="%kernel_device_trees%"
-		LOCPATH="tegra-uboot-flasher"
-		OUT_DIR="$OUT_DIR/colibri_t30"
-		U_BOOT_BINARY=u-boot-dtb-tegra.bin
-		;;
-	*)	echo "script internal error, unknown module type set"
-		exit 1
-		;;
-esac
-
-BINARIES=${MODTYPE}_bin
-
-#is only U-Boot to be copied to RAM?
-if [ "$UBOOT_RECOVERY" -eq 1 ] ; then
-	if [ "${MODTYPE}" = "colibri-t20" ] ; then
-		#some sanity test, we really need RAM_SIZE and MODVERSION set
-		echo ""
-		SANITY_CHECK=1
-		if [ "256" != ${RAM_SIZE} ] && [ "512" != ${RAM_SIZE} ]; then
-			printf "\033[1mplease specify your RAM size with the -r parameter\033[0m\n"
-			SANITY_CHECK=0
-		fi
-
-		if [ "v11" != ${MODVERSION} ] && [ "v12" != ${MODVERSION} ]; then
-			printf "\033[1mplease specify your module version with the -v parameter\033[0m\n"
-			SANITY_CHECK=0
-		fi
-
-		if [ ${SANITY_CHECK} -eq 0 ] ; then
-			Usage
-			exit 1
-		fi
-	fi
-
-	cd ${LOCPATH}
-	sudo ./tegrarcm --bct=../${BINARIES}/${BCT} --bootloader=../${BINARIES}/${U_BOOT_BINARY} --loadaddr=0x80108000 --usb-timeout=5000
-	exit
-fi
-
-#sanity check for awk programs
-AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true
-[ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available.  Aborting."; exit 1; }
-
-#sanity check for correct untared rootfs
-DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'`
-if [ "${DEV_OWNER}x" != "rootx" ]
-then
-	printf "rootfs/dev is not owned by root, but it should!\n"
-	printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n"
-	printf "e.g. sudo tar xjvf Apalis_T30_LinuxImageV2.6Beta1_20160331.tar.bz2\n"
-	exit 1
-fi
-
-#sanity check for existence of U-Boot and kernel
-[ -e ${BINARIES}/${U_BOOT_BINARY} ] || { echo "${BINARIES}/${U_BOOT_BINARY} does not exist"; exit 1; }
-[ -e ${BINARIES}/${KERNEL_IMAGETYPE} ] || { echo "${BINARIES}/${KERNEL_IMAGETYPE} does not exist"; exit 1; }
-
-#Sanity check for some programs. Some distros have fs tools only in root's path
-MCOPY=`command -v mcopy` || { echo >&2 "Program mcopy not available.  Aborting."; exit 1; }
-PARTED=`command -v parted` || PARTED=`sudo -s command -v parted` || { echo >&2 "Program parted not available.  Aborting."; exit 1; }
-MKFSVFAT=`command -v mkfs.fat` || MKFSVFAT=`sudo -s command -v mkfs.fat` || { echo >&2 "Program mkfs.fat not available.  Aborting."; exit 1; }
-MKFSEXT3=`command -v mkfs.ext3` || MKFSEXT3=`sudo -s command -v mkfs.ext3` || { echo >&2 "Program mkfs.ext3 not available.  Aborting."; exit 1; }
-MKFSEXT4=`command -v mkfs.ext4` || MKFSEXT4=`sudo -s command -v mkfs.ext4` || { echo >&2 "Program mkfs.ext4 not available.  Aborting."; exit 1; }
-dd --help >/dev/null 2>&1 || { echo >&2 "Program dd not available.  Aborting."; exit 1; }
-
-CBOOT_CNT=`tegra-uboot-flasher/cbootimage -h | grep -c outputimage || true`
-[ "$CBOOT_CNT" -gt 0 ] || { echo >&2 "Program cbootimage not available. 32bit compatibility libs?  Aborting."; exit 1; }
-
-if [ "${MODTYPE}" = "colibri-t20" ] ; then
-	#sanity check, can we execute mkfs.ubifs, e.g. see the help text?
-	CNT=`sudo $LOCPATH/mkfs.ubifs -h | grep -c space-fixup || true`
-	if [ "$CNT" -eq 0 ] ; then
-		echo "The program mkfs.ubifs can not be executed or does not provide --space-fixup"
-		echo "option."
-		echo "Are you on a 64-bit Linux host without installed 32-bit execution environment?"
-		printf "\033[1mPlease install e.g. ia32-libs on 64-bit Ubuntu\033[0m\n"
-		printf "\033[1mMaybe others are needed e.g. liblzo2:i386 on 64-bit Ubuntu\033[0m\n"
-		exit 1
-	fi
-fi
-
-#Install trap to write a sensible message in case any of the commands below
-#exit premature...
-trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT
-
-#make the directory with the outputfiles writable
-sudo chown $USER: ${BINARIES}
-
-#make a file with the used versions for U-Boot, kernel and rootfs
-sudo touch ${BINARIES}/versions.txt
-sudo chmod ugo+w ${BINARIES}/versions.txt
-echo "Component Versions" > ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${U_BOOT_BINARY}`" >> ${BINARIES}/versions.txt
-basename "`readlink -e ${BINARIES}/${KERNEL_IMAGETYPE}`" >> ${BINARIES}/versions.txt
-ROOTFSVERSION=`egrep -i 't([2-3]0|k1)' rootfs/etc/issue || echo "Version Unknown"`
-echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt
-
-#create subdirectory for this module type
-sudo mkdir -p "$OUT_DIR"
-
-# The eMMC layout used is:
-#
-# boot area partition 1 aka primary eMMC boot sector:
-# with cbootimage containing BCT and U-Boot boot loader and the U-Boot
-# environment before the configblock at the end of that boot area partition
-#
-# boot area partition 2 aka secondary eMMC boot sector:
-# reserved
-#
-# user area aka general purpose eMMC region:
-#
-#    0                      -> IMAGE_ROOTFS_ALIGNMENT         - reserved (not partitioned)
-#    IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE                     - kernel and other data
-#    BOOT_SPACE             -> SDIMG_SIZE                     - rootfs
-#
-#            4MiB               16MiB           SDIMG_ROOTFS
-# <-----------------------> <----------> <---------------------->
-#  ------------------------ ------------ ------------------------
-# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE            |
-#  ------------------------ ------------ ------------------------
-# ^                        ^            ^                        ^
-# |                        |            |                        |
-# 0                      4MiB      4MiB + 16MiB              EMMC_SIZE
-
-# generate cbootimage(s) containing BCT(s) and U-Boot boot loader
-cd ${BINARIES}
-for cbootimage in ${CBOOT_IMAGE}; do
-	sudo ../${LOCPATH}/cbootimage -s ${CBOOT_IMAGE_TARGET} ${cbootimage}.cfg ${cbootimage}
-done
-cd ..
-
-if [ "${MODTYPE}" = "colibri-t20" ] ; then
-	# Prepare full flashing
-	#build ${IMAGEFILE} if it does not exist
-	for blocksize in ${BLOCK}; do
-		sudo $LOCPATH/mkfs.ubifs --space-fixup -c ${MAXLEB} -e ${blocksize} -m ${PAGE} -o ${BINARIES}/${IMAGEFILE}_${blocksize}.img -r rootfs/ -v
-	done
-
-	echo ""
-	echo "UBI image of root file system generated, copying data to target folder..."
-else
-	if [ "${MODTYPE}" = "apalis-t30" ] || [ "${MODTYPE}" = "apalis-tk1" ] || [ "${MODTYPE}" = "apalis-tk1-mainline" ] || [ "${MODTYPE}" = "colibri-t30" ] ; then
-		# Boot partition [in sectors of 512]
-		BOOT_START=$(expr 4096 \* 2)
-		# Rootfs partition [in sectors of 512]
-		ROOTFS_START=$(expr 20480 \* 2)
-		# Boot partition volume id
-		BOOTDD_VOLUME_ID="boot"
-
-		echo ""
-		echo "Creating MBR file and do the partitioning"
-		# Initialize a sparse file
-		dd if=/dev/zero of=${BINARIES}/mbr.bin bs=512 count=0 seek=${EMMC_SIZE}
-		${PARTED} -s ${BINARIES}/mbr.bin mklabel msdos
-		${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary fat32 ${BOOT_START} $(expr ${ROOTFS_START} - 1 )
-		# the partition spans to the end of the disk, even though the fs size will be smaller
-		# on the target the fs is then grown to the full size
-		if [ "${IMAGEFILE}" = "root.ext3" ] ; then
-			${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext3 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1)
-		else
-			${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext4 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1)
-		fi
-		${PARTED} -s ${BINARIES}/mbr.bin unit s print 
-		# get the size of the VFAT partition
-		BOOT_BLOCKS=$(LC_ALL=C ${PARTED} -s ${BINARIES}/mbr.bin unit b print \
-			| awk '/ 1 / { print int(substr($4, 1, length($4 -1)) / 1024) }')
-		# now crop the file to only the MBR size
-		IMG_SIZE=512
-		truncate -s $IMG_SIZE ${BINARIES}/mbr.bin
-
-
-		echo ""
-		echo "Creating VFAT partition image with the kernel"
-		rm -f ${BINARIES}/boot.vfat
-		${MKFSVFAT} -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${BINARIES}/boot.vfat $BOOT_BLOCKS 
-		export MTOOLS_SKIP_CHECK=1
-		mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${KERNEL_IMAGETYPE} ::/${KERNEL_IMAGETYPE}
-
-		# Copy device tree file
-		COPIED=false
-		if test -n "${KERNEL_DEVICETREE}"; then
-			for DTB_FILE in ${KERNEL_DEVICETREE}; do
-				if [ -e "${BINARIES}/${DTB_FILE}" ]; then
-					mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${DTB_FILE} ::/${DTB_FILE}
-					#copy also to out_dir
-					sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/"
-					COPIED=true
-				fi
-			done
-            ([ "${MODTYPE}" = "apalis-tk1" ] || [ "${MODTYPE}" = "apalis-tk1-mainline" ]) && ([ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}.  Aborting."; exit 1; })
-		fi
-
-		echo ""
-		echo "Creating rootfs partition image"
-		#make the partition size size(rootfs used + MIN_PARTITION_FREE_SIZE)
-		#add about 4% to the rootfs to account for fs overhead. (/1024/985 instead of /1024/1024).
-		#add 512 bytes per file to account for small files
-		#(resize it later on target to fill the size of the partition it lives in)
-		NUMBER_OF_FILES=`sudo find ${ROOTFSPATH} | wc -l`
-		EXT_SIZE=`sudo du -DsB1 ${ROOTFSPATH} | awk -v min=$MIN_PARTITION_FREE_SIZE -v f=${NUMBER_OF_FILES} \
-				'{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'`
-
-		rm -f ${BINARIES}/${IMAGEFILE}
-		if [ "${IMAGEFILE}" = "root.ext3" ] ; then
-			sudo $LOCPATH/genext3fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1
-		else
-			sudo $LOCPATH/genext4fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1
-		fi
-	fi
-fi
-
-#copy to $OUT_DIR
-OUT_DIR=`readlink -f $OUT_DIR`
-cd ${BINARIES}
-sudo cp ${CBOOT_IMAGE} ${KERNEL_IMAGETYPE} ${EMMC_PARTS} flash*.img versions.txt "$OUT_DIR"
-sudo cp fwd_blk.img "$OUT_DIR/../flash_blk.img"
-sudo cp fwd_eth.img "$OUT_DIR/../flash_eth.img"
-sudo cp fwd_mmc.img "$OUT_DIR/../flash_mmc.img"
-
-if [ "${IMAGEFILE}" = "root.ext3" ] || [ "${IMAGEFILE}" = "root.ext4" ] ; then
-	if [ "$SPLIT" -ge 1 ] ; then
-		sudo split -a 3 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=100 ${IMAGEFILE} "${OUT_DIR}/${IMAGEFILE}-"
-	fi
-else
-	sudo cp ${IMAGEFILE}* "$OUT_DIR"
-fi
-
-#cleanup intermediate files
-sudo rm ${CBOOT_IMAGE} ${EMMC_PARTS} ${IMAGEFILE}* versions.txt
-cd ..
-sync
-
-#Remove trap and report success!
-trap - EXIT
-printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n"
-
-Flash
diff --git a/recipes-images/images/files/update/no_update_defined.txt b/recipes-images/images/files/update/no_update_defined.txt
deleted file mode 100644
index 34c2429..0000000
--- a/recipes-images/images/files/update/no_update_defined.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-For this machine no directory with the files for the legacy update
-procedure was found. So the legacy update image will not be built.
-
-If you inherited your machine.conf from one of the toradex machines for which
-the legacy update exists make sure to amend your overrides, e.g. if your
-building for a colibri-imx6.conf derived machine add something like this to
-your machine.conf file:
-
-MACHINEOVERRIDES .= ":colibri-imx6
-
-alternatively add a directory tree with the needed files for your machine
-to:
-
-images/files/<machine>/update/
-
-Note that this must not include a file named no_update_defined.txt!
\ No newline at end of file
diff --git a/recipes-images/images/lxde-image.bb b/recipes-images/images/lxde-image.bb
index 6cd49a0..ae95155 100644
--- a/recipes-images/images/lxde-image.bb
+++ b/recipes-images/images/lxde-image.bb
@@ -19,9 +19,6 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
 
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 IMAGE_LINGUAS = "en-us"
 #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb
index e5b6dd0..f7e6738 100644
--- a/recipes-images/images/lxqt-image.bb
+++ b/recipes-images/images/lxqt-image.bb
@@ -19,9 +19,6 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
 
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 inherit populate_sdk populate_sdk_qt5
 
 IMAGE_LINGUAS = "en-us"
diff --git a/recipes-images/images/qt-x11-image.bb b/recipes-images/images/qt-x11-image.bb
index 3e5f8a3..26158b3 100644
--- a/recipes-images/images/qt-x11-image.bb
+++ b/recipes-images/images/qt-x11-image.bb
@@ -19,9 +19,6 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
 
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 IMAGE_LINGUAS = "en-us"
 #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb
index 2c757c2..7c43d4a 100644
--- a/recipes-images/images/qt4e-demo-image.bb
+++ b/recipes-images/images/qt4e-demo-image.bb
@@ -13,9 +13,6 @@ IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}"
 #start graphical target by default (start new qt-demo-init systemd service)
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 IMAGE_LINGUAS = "en-us"
 #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb
index 11847d4..5fe9cc6 100644
--- a/recipes-images/images/qt5-x11-image.bb
+++ b/recipes-images/images/qt5-x11-image.bb
@@ -24,9 +24,6 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}"
 
 SYSTEMD_DEFAULT_TARGET = "graphical.target"
 
-#create the deployment directory-tree
-require recipes-images/images/tdx-image-fstype.inc
-
 inherit populate_sdk populate_sdk_qt5
 
 IMAGE_LINGUAS = "en-us"
diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc
deleted file mode 100644
index 1f4a415..0000000
--- a/recipes-images/images/tdx-image-fstype.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-#create the deployment directory-tree
-
-PV = "${TDX_VER_PACKAGE_MIN}"
-IMAGE_DIR = "${IMAGE_NAME}_${TDX_VER_ITEM}"
-IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
-
-UBOOT_EXT = "bin"
-UBOOT_EXT_mx6 = "img"
-UBOOT_EXT_use-mainline-bsp = "img"
-UBOOT_EXT_colibri-imx6ull = "imx"
-UBOOT_EXT_mx7 = "imx"
-UBOOT_EXT_vf = "imx"
-UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_EXT}"
-UBOOT_SYMLINK_tegra124 = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}"
-UBOOT_SYMLINK_tegra124m = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}"
-UBOOT_BINARY = "u-boot.${UBOOT_EXT}"
-UBOOT_BINARY_colibri-imx7 = "u-boot-nand.${UBOOT_EXT}"
-UBOOT_BINARY_colibri-imx6ull = "u-boot-nand.${UBOOT_EXT}"
-UBOOT_BINARY_tegra124 = "u-boot-dtb-tegra.${UBOOT_EXT}"
-UBOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${UBOOT_EXT}"
-
-#we need some native tools for deployment
-DEPENDS_append = " pbzip2-native tdx-updater"
-DEPENDS_append_mx6 = " imx-loader-native"
-DEPENDS_append_use-mainline-bsp = " imx-loader-native"
-DEPENDS_append_mx6ull = " mtd-utils-native imx-loader-native"
-DEPENDS_append_mx7 = " mtd-utils-native imx-loader-native"
-DEPENDS_append_tegra124 = " cbootimage-native tegrarcm-native"
-DEPENDS_append_tegra124m = " cbootimage-native tegrarcm-native"
-DEPENDS_append_vf = " mtd-utils-native imx-loader-native"
-#we need mkimage to produce the U-Boot scripts even if not building a uImage kernel
-DEPENDS_append_arm = " virtual/bootloader u-boot-mkimage-native"
-DEPENDS_remove_qemuall = "virtual/bootloader"
-
-imagedeploytools() {
-    # default to nothing to deploy
-    :
-}
-
-imagedeploytools-all-mx6qdl() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
-    mkdir -p ${IMAGE_ROOT}
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
-}
-
-imagedeploytools_append_mx6() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
-    mkdir -p ${IMAGE_ROOT}
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
-}
-
-imagedeploytools_append_use-mainline-bsp() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/imx_flash/imx_usb ${IMAGE_ROOT}/imx_flash/*.conf
-    mkdir -p ${IMAGE_ROOT}
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
-
-}
-
-imagedeploytools_append_mx6ull() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/mkfs.ubifs  ${IMAGE_ROOT}/imx_usb
-    mkdir -p ${IMAGE_ROOT}
-
-    # add the mkfs.ubifs binary
-    cp ${STAGING_DIR_NATIVE}/usr/sbin/mkfs.ubifs ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/mkfs.ubifs
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
-
-# FIXME
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_*.conf ${IMAGE_ROOT}/
-}
-
-imagedeploytools_append_mx7() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../imx_flash/"
-    rm -f ${IMAGE_ROOT}/mkfs.ubifs  ${IMAGE_ROOT}/imx_usb
-    mkdir -p ${IMAGE_ROOT}
-
-    # add the mkfs.ubifs binary
-    cp ${STAGING_DIR_NATIVE}/usr/sbin/mkfs.ubifs ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/mkfs.ubifs
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_*.conf ${IMAGE_ROOT}/
-    cp ${MACHINE_BIN}/${UBOOT_BINARY} ${MACHINE_BIN}/u-boot.imx
-}
-
-imagedeploytools_append_tegra124() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../tegra-uboot-flasher/"
-    mkdir -p ${IMAGE_ROOT}
-
-    # add cbootimage and tegrarcm
-    cp ${STAGING_BINDIR_NATIVE}/cbootimage ${IMAGE_ROOT}/
-    cp ${STAGING_BINDIR_NATIVE}/tegrarcm ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/cbootimage
-    ${BUILD_STRIP} ${IMAGE_ROOT}/tegrarcm
-}
-
-imagedeploytools_append_tegra124m() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../tegra-uboot-flasher/"
-    mkdir -p ${IMAGE_ROOT}
-
-    # add cbootimage and tegrarcm
-    cp ${STAGING_BINDIR_NATIVE}/cbootimage ${IMAGE_ROOT}/
-    cp ${STAGING_BINDIR_NATIVE}/tegrarcm ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/cbootimage
-    ${BUILD_STRIP} ${IMAGE_ROOT}/tegrarcm
-}
-
-
-imagedeploytools_append_vf() {
-    IMAGE_ROOT="${IMAGE_ROOTFS}/../vf_flash/"
-    rm -f ${IMAGE_ROOT}/mkfs.ubifs  ${IMAGE_ROOT}/imx_uart
-    mkdir -p ${IMAGE_ROOT}
-
-    # add the mkfs.ubifs binary
-    cp ${STAGING_DIR_NATIVE}/usr/sbin/mkfs.ubifs ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/mkfs.ubifs
-
-    # add imx-loader and its configuration files
-    cp ${STAGING_BINDIR_NATIVE}/imx_uart ${IMAGE_ROOT}/
-    ${BUILD_STRIP} ${IMAGE_ROOT}/imx_uart*
-    cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/vybrid_usb_*.conf ${IMAGE_ROOT}/
-}
-
-imagedeploy_kernel() {
-    # put kernel, existing device-tree(s) into the bin directories
-    cp -pP ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}* ${MACHINE_BIN}/
-    ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${MACHINE_BIN}/
-    mv ${MACHINE_BIN}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ${MACHINE_BIN}/${KERNEL_IMAGETYPE}
-}
-
-fakeroot imagedeploy() {
-    :
-}
-
-fakeroot imagedeploy_arm() {
-    cd ${WORKDIR}
-    cp -Lr ${RECIPE_SYSROOT}${datadir}/update/* ${IMAGE_DIR}/
-    export MACHINE_BIN=$(readlink -e ${IMAGE_ROOTFS}/../*_bin)
-
-    sed -i 's/%kernel_device_trees%/${KERNEL_DEVICETREE}/' ${IMAGE_DIR}/update.sh
-
-    cd ${IMAGE_DIR}/*_bin
-    ./mk-u-boot-scripts.sh
-    cd ${WORKDIR}
-
-    imagedeploy_kernel
-
-    cp -P ${DEPLOY_DIR_IMAGE}/u-boot* ${MACHINE_BIN}/
-    if [ -e ${DEPLOY_DIR_IMAGE}/SPL ]
-    then
-        cp -P ${DEPLOY_DIR_IMAGE}/SPL* ${MACHINE_BIN}/
-    fi
-    rm -f ${MACHINE_BIN}/u-boot-hsmmc-${MACHINE}.${UBOOT_EXT}
-    mv ${MACHINE_BIN}/${UBOOT_SYMLINK} ${MACHINE_BIN}/${UBOOT_BINARY}
-
-    # add additional tools if required
-    imagedeploytools
-
-    # remove intermediate file rootfs.lock
-    rm -f ${IMAGE_DIR}/rootfs.lock
-
-    #create tarball
-    # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs
-    tar --use-compress-prog=pbzip2 --numeric-owner -cf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}_${TDX_VER_PACKAGE}.tar.bz2 ${IMAGE_DIR} || true
-}
-
-fakeroot do_imagedeploy() {
-    if [ ! -e ${RECIPE_SYSROOT}/${datadir}/update/no_update_defined.txt ]
-    then
-        imagedeploy
-    fi
-}
-addtask imagedeploy after do_image before do_image_complete
-
-# make sure to rerun do_rootfs before do_imagedeploy is executed
-do_imagedeploy[vardep] = "do_rootfs"
-
-# defaults
-TDX_VER_PACKAGE_MIN ??= "nodistro"
-TDX_VER_PACKAGE ??= "nodistro"
-TDX_VER_ITEM ??= "nodistro"
diff --git a/recipes-images/images/tdx-updater_1.0.bb b/recipes-images/images/tdx-updater_1.0.bb
deleted file mode 100644
index bee6a35..0000000
--- a/recipes-images/images/tdx-updater_1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Toradex legacy updater host files"
-DESCRIPTION = "Deploys files used by tdx-image-fstype.inc to create \
-the legacy update tarball."
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRC_URI = "file://update file://library"
-
-do_install () {
-    install -d ${D}/${datadir}/update
-    cp -Lr ${WORKDIR}/update/* ${D}/${datadir}/update/
-}
-
-FILES_${PN} += "${datadir}/update"
-PACKAGE_ARCH = "${MACHINE_ARCH}"