image-fstype: rework files installation

This adds a new recipe tdx-updater which provides the files needed by
tdx-image-fstype.inc rather than copying them in a non OE way in
tdx-image-fstype.inc.

This required to restructure the layout in files. An additional update
directory is inserted. Also in each of the overrides directories a
symlink to library is created.

This now allows to build legacy update images with a custom machine
configuration if one adds the relevant machine override, e.g. for a
machine targeting a colibri-imx6 module:
MACHINEOVERRIDES .= ":colibri-imx6"

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

125 files changed, 56 insertions, 27 deletions

diff --git a/recipes-images/images/files/apalis-imx6/library b/recipes-images/images/files/apalis-imx6/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/apalis-imx6/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_blk.scr
index e980bc6..e980bc6 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_blk.scr
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_eth.scr
index 18c02a9..18c02a9 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/flash_eth.scr
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/apalis-imx6/apalis-imx6_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/apalis-imx6/update/apalis-imx6_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/apalis-imx6/imx_flash/genext4fs.sh b/recipes-images/images/files/apalis-imx6/update/imx_flash/genext4fs.sh
index f7eeef9..f7eeef9 120000
--- a/recipes-images/images/files/apalis-imx6/imx_flash/genext4fs.sh
+++ b/recipes-images/images/files/apalis-imx6/update/imx_flash/genext4fs.sh
diff --git a/recipes-images/images/files/apalis-imx6/update.sh b/recipes-images/images/files/apalis-imx6/update/update.sh
index fc60d21..fc60d21 120000
--- a/recipes-images/images/files/apalis-imx6/update.sh
+++ b/recipes-images/images/files/apalis-imx6/update/update.sh
diff --git a/recipes-images/images/files/apalis-t30/library b/recipes-images/images/files/apalis-t30/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/apalis-t30/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct
index f228cd2..f228cd2 100644
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/Apalis_T30_2GB_800Mhz.bct
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/apalis_t30.img.cfg b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30.img.cfg
index 6fbdc0d..6fbdc0d 100644
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/apalis_t30.img.cfg
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30.img.cfg
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct
index 423aad1..423aad1 100644
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_blk.scr
index 8bdb6ef..8bdb6ef 100644
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_blk.scr
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_eth.scr
index 3a01ae3..3a01ae3 100644
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/flash_eth.scr
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/apalis-t30/apalis-t30_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/apalis-t30/apalis-t30_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/apalis-t30/update/apalis-t30_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/apalis-t30/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/apalis-t30/update/tegra-uboot-flasher/genext3fs.sh
index cc716db..cc716db 120000
--- a/recipes-images/images/files/apalis-t30/tegra-uboot-flasher/genext3fs.sh
+++ b/recipes-images/images/files/apalis-t30/update/tegra-uboot-flasher/genext3fs.sh
diff --git a/recipes-images/images/files/apalis-t30/update.sh b/recipes-images/images/files/apalis-t30/update/update.sh
index 6ebea84..6ebea84 120000
--- a/recipes-images/images/files/apalis-t30/update.sh
+++ b/recipes-images/images/files/apalis-t30/update/update.sh
diff --git a/recipes-images/images/files/apalis-tk1-mainline/library b/recipes-images/images/files/apalis-tk1-mainline/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/apalis-tk1-mainline/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1-mainline/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
index 556a40e..556a40e 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/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
diff --git a/recipes-images/images/files/apalis-tk1-mainline/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
index b9d203c..b9d203c 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/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
diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_blk.scr
index 76868d5..76868d5 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_blk.scr
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_blk.scr
diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_eth.scr
index 2793bac..2793bac 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/flash_eth.scr
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/flash_eth.scr
diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_blk.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_blk.scr
index 7af72e6..7af72e6 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_blk.scr
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_eth.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_eth.scr
index d7ea35c..d7ea35c 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_eth.scr
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_mmc.scr
index 4c8f666..4c8f666 100644
--- a/recipes-images/images/files/apalis-tk1-mainline/apalis-tk1-mainline_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/apalis-tk1-mainline_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/apalis-tk1-mainline/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
index dda47d5..dda47d5 100755
--- a/recipes-images/images/files/apalis-tk1-mainline/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
diff --git a/recipes-images/images/files/apalis-tk1-mainline/tegra-uboot-flasher/genext4fs.sh b/recipes-images/images/files/apalis-tk1-mainline/update/tegra-uboot-flasher/genext4fs.sh
index f7eeef9..f7eeef9 120000
--- a/recipes-images/images/files/apalis-tk1-mainline/tegra-uboot-flasher/genext4fs.sh
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/tegra-uboot-flasher/genext4fs.sh
diff --git a/recipes-images/images/files/apalis-tk1-mainline/update.sh b/recipes-images/images/files/apalis-tk1-mainline/update/update.sh
index 6ebea84..6ebea84 120000
--- a/recipes-images/images/files/apalis-tk1-mainline/update.sh
+++ b/recipes-images/images/files/apalis-tk1-mainline/update/update.sh
diff --git a/recipes-images/images/files/apalis-tk1/library b/recipes-images/images/files/apalis-tk1/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/apalis-tk1/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/apalis-tk1/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
index 556a40e..556a40e 100644
--- a/recipes-images/images/files/apalis-tk1/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
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/apalis-tk1.img.cfg b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/apalis-tk1.img.cfg
index b9d203c..b9d203c 100644
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/apalis-tk1.img.cfg
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/apalis-tk1.img.cfg
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_blk.scr
index 76868d5..76868d5 100644
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_blk.scr
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_blk.scr
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_eth.scr
index 2793bac..2793bac 100644
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/flash_eth.scr
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/flash_eth.scr
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_blk.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_blk.scr
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_eth.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_eth.scr
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_mmc.scr b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/apalis-tk1/apalis-tk1_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/apalis-tk1/update/apalis-tk1_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/apalis-tk1/tegra-uboot-flasher/genext4fs.sh b/recipes-images/images/files/apalis-tk1/update/tegra-uboot-flasher/genext4fs.sh
index f7eeef9..f7eeef9 120000
--- a/recipes-images/images/files/apalis-tk1/tegra-uboot-flasher/genext4fs.sh
+++ b/recipes-images/images/files/apalis-tk1/update/tegra-uboot-flasher/genext4fs.sh
diff --git a/recipes-images/images/files/apalis-tk1/update.sh b/recipes-images/images/files/apalis-tk1/update/update.sh
index 6ebea84..6ebea84 120000
--- a/recipes-images/images/files/apalis-tk1/update.sh
+++ b/recipes-images/images/files/apalis-tk1/update/update.sh
diff --git a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr
deleted file mode 120000
index e980bc6..0000000
--- a/recipes-images/images/files/colibri-imx6/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/colibri-imx6_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr
deleted file mode 120000
index 18c02a9..0000000
--- a/recipes-images/images/files/colibri-imx6/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/imx_flash/genext4fs.sh b/recipes-images/images/files/colibri-imx6/imx_flash/genext4fs.sh
deleted file mode 120000
index f7eeef9..0000000
--- a/recipes-images/images/files/colibri-imx6/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/library b/recipes-images/images/files/colibri-imx6/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6/update.sh b/recipes-images/images/files/colibri-imx6/update.sh
deleted file mode 120000
index fc60d21..0000000
--- a/recipes-images/images/files/colibri-imx6/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-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_blk.scr
index e980bc6..e980bc6 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_eth.scr
index 18c02a9..18c02a9 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/colibri-imx6-mainline_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-imx6/update/colibri-imx6_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext4fs.sh b/recipes-images/images/files/colibri-imx6/update/imx_flash/genext4fs.sh
index f7eeef9..f7eeef9 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/imx_flash/genext4fs.sh
+++ b/recipes-images/images/files/colibri-imx6/update/imx_flash/genext4fs.sh
diff --git a/recipes-images/images/files/colibri-imx6-mainline/update.sh b/recipes-images/images/files/colibri-imx6/update/update.sh
index fc60d21..fc60d21 120000
--- a/recipes-images/images/files/colibri-imx6-mainline/update.sh
+++ b/recipes-images/images/files/colibri-imx6/update/update.sh
diff --git a/recipes-images/images/files/colibri-imx6ull/library b/recipes-images/images/files/colibri-imx6ull/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx6ull/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_blk.scr
index b8b8a93..b8b8a93 100644
--- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_eth.scr
index c65c1d3..c65c1d3 100644
--- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-imx6ull/update/colibri-imx6ull_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-imx6ull/update.sh b/recipes-images/images/files/colibri-imx6ull/update/update.sh
index 03cd893..03cd893 100755
--- a/recipes-images/images/files/colibri-imx6ull/update.sh
+++ b/recipes-images/images/files/colibri-imx6ull/update/update.sh
diff --git a/recipes-images/images/files/colibri-imx7/library b/recipes-images/images/files/colibri-imx7/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-imx7/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_blk.scr
index 9fa6296..9fa6296 100644
--- a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_eth.scr
index 20244d7..20244d7 100644
--- a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/fwd_blk.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/fwd_eth.scr b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-imx7/update/colibri-imx7_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-imx7/update.sh b/recipes-images/images/files/colibri-imx7/update/update.sh
index f6dfcc2..f6dfcc2 100755
--- a/recipes-images/images/files/colibri-imx7/update.sh
+++ b/recipes-images/images/files/colibri-imx7/update/update.sh
diff --git a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_blk.scr b/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_blk.scr
deleted file mode 100644
index d6f89e0..0000000
--- a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_blk.scr
+++ /dev/null
@@ -1 +0,0 @@
-# dummy U-Boot update script
diff --git a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_eth.scr b/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_eth.scr
deleted file mode 100644
index d6f89e0..0000000
--- a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/flash_eth.scr
+++ /dev/null
@@ -1 +0,0 @@
-# dummy U-Boot update script
diff --git a/recipes-images/images/files/colibri-t20/library b/recipes-images/images/files/colibri-t20/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-t20/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-hsmmc.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.bct
index bcef8b1..bcef8b1 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-hsmmc.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg
index 6fc664d..6fc664d 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-hsmmc.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v11-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.bct
index 7ddd5d8..7ddd5d8 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v11-nand.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg
index 3ce017e..3ce017e 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v11-nand.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v12-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.bct
index 365877f..365877f 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v12-nand.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg
index 41ed535..41ed535 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-256-v12-nand.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-hsmmc.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.bct
index 09eb434..09eb434 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-hsmmc.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg
index 60760fc..60760fc 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-hsmmc.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v11-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.bct
index 5d68994..5d68994 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v11-nand.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg
index 992f47a..992f47a 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v11-nand.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v12-nand.bct b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.bct
index f9db8fc..f9db8fc 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v12-nand.bct
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.bct
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg
index cb96289..cb96289 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/colibri_t20-512-v12-nand.img.cfg
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_blk.scr
index b2728bb..b2728bb 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_eth.scr
index 7f4cbb4..7f4cbb4 100644
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/fwd_blk.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/fwd_eth.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-imx7/colibri-imx7_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-t20/update/colibri-t20_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-t20/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/colibri-t20/update/tegra-uboot-flasher/genext3fs.sh
index cc716db..cc716db 120000
--- a/recipes-images/images/files/colibri-t20/tegra-uboot-flasher/genext3fs.sh
+++ b/recipes-images/images/files/colibri-t20/update/tegra-uboot-flasher/genext3fs.sh
diff --git a/recipes-images/images/files/colibri-t20/update.sh b/recipes-images/images/files/colibri-t20/update/update.sh
index 6ebea84..6ebea84 120000
--- a/recipes-images/images/files/colibri-t20/update.sh
+++ b/recipes-images/images/files/colibri-t20/update/update.sh
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr b/recipes-images/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-t30/colibri-t30_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-t30/colibri-t30_bin/fwd_eth.scr b/recipes-images/images/files/colibri-t30/colibri-t30_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-t30/colibri-t30_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-t30/colibri-t30_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-t30/colibri-t30_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-t30/colibri-t30_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-t30/library b/recipes-images/images/files/colibri-t30/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-t30/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30.img.cfg b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30.img.cfg
index d797a13..d797a13 100644
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30.img.cfg
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30.img.cfg
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct
index 109f0c0..109f0c0 100755
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct
index 0349242..0349242 100644
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_blk.scr
index aefc08f..aefc08f 100644
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_eth.scr
index 26eb0a3..26eb0a3 100644
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/fwd_blk.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/fwd_eth.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-pxa/colibri-pxa_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-t30/update/colibri-t30_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-t30/tegra-uboot-flasher/genext3fs.sh b/recipes-images/images/files/colibri-t30/update/tegra-uboot-flasher/genext3fs.sh
index cc716db..cc716db 120000
--- a/recipes-images/images/files/colibri-t30/tegra-uboot-flasher/genext3fs.sh
+++ b/recipes-images/images/files/colibri-t30/update/tegra-uboot-flasher/genext3fs.sh
diff --git a/recipes-images/images/files/colibri-t30/update.sh b/recipes-images/images/files/colibri-t30/update/update.sh
index 6ebea84..6ebea84 120000
--- a/recipes-images/images/files/colibri-t30/update.sh
+++ b/recipes-images/images/files/colibri-t30/update/update.sh
diff --git a/recipes-images/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr b/recipes-images/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr
deleted file mode 120000
index 5954646..0000000
--- a/recipes-images/images/files/colibri-vf/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/colibri-vf_bin/fwd_eth.scr b/recipes-images/images/files/colibri-vf/colibri-vf_bin/fwd_eth.scr
deleted file mode 120000
index decc214..0000000
--- a/recipes-images/images/files/colibri-vf/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/colibri-vf_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-vf/colibri-vf_bin/fwd_mmc.scr
deleted file mode 120000
index 3848cfa..0000000
--- a/recipes-images/images/files/colibri-vf/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/colibri-vf_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-vf/colibri-vf_bin/mk-u-boot-scripts.sh
deleted file mode 120000
index ce71dbd..0000000
--- a/recipes-images/images/files/colibri-vf/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/library b/recipes-images/images/files/colibri-vf/library
new file mode 120000
index 0000000..53bed96
--- /dev/null
+++ b/recipes-images/images/files/colibri-vf/library
@@ -0,0 +1 @@
+../library
\ No newline at end of file
diff --git a/recipes-images/images/files/colibri-vf/README b/recipes-images/images/files/colibri-vf/update/README
index 8d283da..8d283da 100644
--- a/recipes-images/images/files/colibri-vf/README
+++ b/recipes-images/images/files/colibri-vf/update/README
diff --git a/recipes-images/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_blk.scr
index ae0fd5c..ae0fd5c 100644
--- a/recipes-images/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_blk.scr
diff --git a/recipes-images/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_eth.scr
index b0e4904..b0e4904 100644
--- a/recipes-images/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/flash_eth.scr
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_blk.scr
index 5954646..5954646 120000
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_blk.scr
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_eth.scr
index decc214..decc214 120000
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_eth.scr
diff --git a/recipes-images/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_mmc.scr
index 3848cfa..3848cfa 120000
--- a/recipes-images/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/fwd_mmc.scr
diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/mk-u-boot-scripts.sh b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/mk-u-boot-scripts.sh
index ce71dbd..ce71dbd 120000
--- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/mk-u-boot-scripts.sh
+++ b/recipes-images/images/files/colibri-vf/update/colibri-vf_bin/mk-u-boot-scripts.sh
diff --git a/recipes-images/images/files/colibri-vf/format_sd.sh b/recipes-images/images/files/colibri-vf/update/format_sd.sh
index 79cc985..79cc985 100755
--- a/recipes-images/images/files/colibri-vf/format_sd.sh
+++ b/recipes-images/images/files/colibri-vf/update/format_sd.sh
diff --git a/recipes-images/images/files/colibri-vf/update.sh b/recipes-images/images/files/colibri-vf/update/update.sh
index 0b6b3af..0b6b3af 100755
--- a/recipes-images/images/files/colibri-vf/update.sh
+++ b/recipes-images/images/files/colibri-vf/update/update.sh
diff --git a/recipes-images/images/files/update/no_update_defined.txt b/recipes-images/images/files/update/no_update_defined.txt
new file mode 100644
index 0000000..34c2429
--- /dev/null
+++ b/recipes-images/images/files/update/no_update_defined.txt
@@ -0,0 +1,16 @@
+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/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc
index 13ff51e..8062284 100644
--- a/recipes-images/images/tdx-image-fstype.inc
+++ b/recipes-images/images/tdx-image-fstype.inc
@@ -3,7 +3,6 @@
 include conf/tdx_version.conf
 
 PV = "${TDX_VER_PACKAGE_MIN}"
-BURNFLASH := "${THISDIR}/files/${MACHINE}"
 IMAGE_DIR = "${IMAGE_NAME}_${TDX_VER_ITEM}"
 IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
 
@@ -25,7 +24,7 @@ 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"
+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"
@@ -37,7 +36,7 @@ DEPENDS_append_tegra2 = " mtd-utils-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_qemuarm = "virtual/bootloader"
+DEPENDS_remove_qemuall = "virtual/bootloader"
 
 imagedeploytools() {
     # default to nothing to deploy
@@ -113,7 +112,7 @@ imagedeploytools_append_mx7() {
     ${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 ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_BINARY} ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot.imx
+    cp ${MACHINE_BIN}/${UBOOT_BINARY} ${MACHINE_BIN}/u-boot.imx
 }
 
 imagedeploytools_append_tegra() {
@@ -173,9 +172,9 @@ imagedeploytools_append_vf() {
 
 imagedeploy_kernel() {
     # put kernel, existing device-tree(s) into the bin directories
-    cp -pP ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
-    ls ${DEPLOY_DIR_IMAGE}/*.dtb 2> /dev/null && cp -pP ${DEPLOY_DIR_IMAGE}/*.dtb ${IMAGE_ROOTFS}/../${MACHINE}_bin/
-    mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_ROOTFS}/../${MACHINE}_bin/${KERNEL_IMAGETYPE}
+    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() {
@@ -184,23 +183,24 @@ fakeroot imagedeploy() {
 
 fakeroot imagedeploy_arm() {
     cd ${WORKDIR}
-    cp -Lr ${BURNFLASH}/* ${IMAGE_DIR}/
+    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}/${MACHINE}_bin
+    cd ${IMAGE_DIR}/*_bin
     ./mk-u-boot-scripts.sh
     cd ${WORKDIR}
 
     imagedeploy_kernel
 
-    cp -P ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
+    cp -P ${DEPLOY_DIR_IMAGE}/u-boot* ${MACHINE_BIN}/
     if [ -e ${DEPLOY_DIR_IMAGE}/SPL ]
     then
-        cp -P ${DEPLOY_DIR_IMAGE}/SPL* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
+        cp -P ${DEPLOY_DIR_IMAGE}/SPL* ${MACHINE_BIN}/
     fi
-    rm -f ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-hsmmc-${MACHINE}.${UBOOT_EXT}
-    mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_SYMLINK} ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_BINARY}
+    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
@@ -214,7 +214,7 @@ fakeroot imagedeploy_arm() {
 }
 
 fakeroot do_imagedeploy() {
-    if [ -e ${BURNFLASH} ]
+    if [ ! -e ${RECIPE_SYSROOT}/${datadir}/update/no_update_defined.txt ]
     then
         imagedeploy
     fi
diff --git a/recipes-images/images/tdx-updater_1.0.bb b/recipes-images/images/tdx-updater_1.0.bb
new file mode 100644
index 0000000..bee6a35
--- /dev/null
+++ b/recipes-images/images/tdx-updater_1.0.bb
@@ -0,0 +1,16 @@
+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}"