toradex: update to latest release

Update toradex layers to 2.8b3 (rocko) and make the necessary
adaptations. Use WIC for image creation.

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

6 files changed, 21 insertions, 30 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index 0d3fd29..b4f4eef 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -31,15 +31,13 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
-IMAGE_FSTYPES += "teziimg"
-
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
     "
 
-BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+IMAGE_BOOT_FILES += " \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
+    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
     "
 
 SERIAL_CONSOLES = "115200;ttymxc0 \
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index f1bf7d8..a216613 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -31,13 +31,11 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 
-IMAGE_FSTYPES += "teziimg"
-
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
     "
 
-BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+IMAGE_BOOT_FILES += " \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
+    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 37731fb..da92ad3 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -31,14 +31,12 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
 
-IMAGE_FSTYPES += "teziimg"
-
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
     "
 
-BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+IMAGE_BOOT_FILES += " \
+    u-boot-${MACHINE}.imx;${MACHINEDIR}/u-boot.imx \
     "
 
 PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 1c3889f..c7aa169 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -31,14 +31,12 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 
-IMAGE_FSTYPES += "teziimg"
-
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
     "
 
-BOOT_SCRIPTS += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+IMAGE_BOOT_FILES += " \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
     "
 
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index 829c8ab..ecd01da 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
@@ -33,8 +33,8 @@ DEPLOY_CONF_NAME = "Toradex Colibri VF"
 
 IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
 
-BOOT_SCRIPTS += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+IMAGE_BOOT_FILES += " \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
     "
 
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 85d9455..f61aad7 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -29,6 +29,9 @@
 
 include conf/distro/include/fsl.inc
 
+# include file from meta-toradex-nxp
+require conf/machine/include/${MACHINE}.inc
+
 BBMASK += "\
    meta-toradex-nxp/recipes-graphics/xorg-xserver \
    meta-toradex-bsp-common/recipes-devtools/python \
@@ -37,16 +40,12 @@ BBMASK += "\
 
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex"
+WKS_FILE_DEPENDS += "u-boot-script-toradex"
 
 MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
-BOOT_SCRIPTS += " \
-    fwd_blk.img:flash_blk.img \
-    fwd_eth.img:flash_eth.img \
-    fwd_mmc.img:flash_mmc.img \
-    ${MACHINE}:${MACHINEDIR} \
+IMAGE_BOOT_FILES += " \
+    fwd_blk.img;flash_blk.img \
+    fwd_eth.img;flash_eth.img \
+    fwd_mmc.img;flash_mmc.img \
+    ${MACHINE}/*;${MACHINEDIR}/ \
     "
-
-# fix: basehash value changed from ... to ....
-# The metadata is not deterministic and this needs to be fixed.
-rootfs_tezi_json[vardepsexclude] = "DATE"