poky: update to 2.5 branch (sumo)

Update yocto from 2.3.4 (pyro) to 2.5.1 (sumo):

- Update poky, meta-openembedded & meta-mingw to sumo branch
- update image classes (obsolete IMAGE_DEPENDS definitions)
- Update bbappends under meta-boot2qt-distro
- Update meta-*-extras layers bbappends & patches

All recipes related to nitrogen6x are fixed here, but this depends
on follow up commits to work correctly.

Task-number: QTBUG-68681
Change-Id: Ic5802c5c1a3989bed746f96f8cf173743ec755bb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

3 files changed, 21 insertions, 22 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index c8f5424..b08e11a 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -35,8 +35,6 @@ BBMASK += " \
     meta-boundary/recipes-mozilla/firefox \
     "
 
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
-
 MACHINE_EXTRA_INSTALL += "\
     kernel-module-qcacld \
     linux-firmware-bdsdmac-wlan \
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 32fec1b..5f22dd4 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -29,7 +29,7 @@
 
 BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5"
 
-IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_FSTYPES += "ext3 wic"
 IMAGE_CLASSES += "image_types_fsl"
 
 QBSP_IMAGE_CONTENT ?= "\
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index 894d51d..f6871be 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -33,25 +33,26 @@ include conf/distro/include/opencv.inc
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 
 BOOT_SPACE = "16384"
-BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
-                 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
-                 u-boot-nit6xlite1g-*.imx:u-boot.nit6xlite1g \
-                 u-boot-nitrogen6dl-*.imx:u-boot.nitrogen6dl \
-                 u-boot-nitrogen6dl2g-*.imx:u-boot.nitrogen6dl2g \
-                 u-boot-nitrogen6q2g-*.imx:u-boot.nitrogen6q2g \
-                 u-boot-nitrogen6q-*.imx:u-boot.nitrogen6q \
-                 u-boot-nitrogen6q_fl-*.imx:u-boot.nitrogen6q_fl \
-                 u-boot-nitrogen6qp_max-*.imx:u-boot.nitrogen6qp_max \
-                 u-boot-nitrogen6s1g-*.imx:u-boot.nitrogen6s1g \
-                 u-boot-nitrogen6s-*.imx:u-boot.nitrogen6s \
-                 u-boot-nitrogen6sx-*.imx:u-boot.nitrogen6sx \
-                 u-boot-nitrogen6_lum_dl1-*.imx:u-boot.nitrogen6_lum_dl1 \
-                 u-boot-nitrogen6_max-*.imx:u-boot.nitrogen6_max \
-                 u-boot-nitrogen6_vm1g-*.imx:u-boot.nitrogen6_vm1g \
-                 u-boot-nitrogen6_vm-*.imx:u-boot.nitrogen6_vm \
-                "
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary"
+IMAGE_BOOT_FILES += "\
+    upgrade.scr-${MACHINE};upgrade.scr \
+    upgrade.scr-${MACHINE};6x_upgrade \
+    u-boot-${MACHINE}.imx-nit6xlite;u-boot.nit6xlite \
+    u-boot-${MACHINE}.imx-nit6xlite1g;u-boot.nit6xlite1g \
+    u-boot-${MACHINE}.imx-nitrogen6dl;u-boot.nitrogen6dl \
+    u-boot-${MACHINE}.imx-nitrogen6dl2g;u-boot.nitrogen6dl2g \
+    u-boot-${MACHINE}.imx-nitrogen6q2g;u-boot.nitrogen6q2g \
+    u-boot-${MACHINE}.imx-nitrogen6q;u-boot.nitrogen6q \
+    u-boot-${MACHINE}.imx-nitrogen6q_fl;u-boot.nitrogen6q_fl \
+    u-boot-${MACHINE}.imx-nitrogen6qp_max;u-boot.nitrogen6qp_max \
+    u-boot-${MACHINE}.imx-nitrogen6s1g;u-boot.nitrogen6s1g \
+    u-boot-${MACHINE}.imx-nitrogen6s;u-boot.nitrogen6s \
+    u-boot-${MACHINE}.imx-nitrogen6sx;u-boot.nitrogen6sx \
+    u-boot-${MACHINE}.imx-nitrogen6_lum_dl1;u-boot.nitrogen6_lum_dl1 \
+    u-boot-${MACHINE}.imx-nitrogen6_max;u-boot.nitrogen6_max \
+    u-boot-${MACHINE}.imx-nitrogen6_vm1g;u-boot.nitrogen6_vm1g \
+    u-boot-${MACHINE}.imx-nitrogen6_vm;u-boot.nitrogen6_vm \
+    "
+WKS_FILE_DEPENDS += "u-boot"
 
 UBOOT_MACHINE = ""
 UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \