203 files changed, 2652 insertions, 2436 deletions
diff --git a/README b/README
index 592faea..fc411c7 100644
--- a/README
+++ b/README
@@ -64,7 +64,8 @@ Samuli Piippo <samuli.piippo@qt.io>
 Setting up build environment
 ----------------------------
-To initialize build environment, use the b2qt-init-build-env script.
+To initialize build environment, use the b2qt-init-build-env script. Create a
+new directory for Yocto builds and run the script in it.
 Usage: b2qt-init-build-env COMMAND [ARGS]
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 5aa39f1..66ae73b 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -34,9 +34,10 @@ usage() {
   echo "Usage: $(basename $0) COMMAND [ARGS]"
   echo
   echo "Initialize build environment:"
-   echo "  $(basename $0) init --device <name> [--reference <mirror path>] [--internal]"
+   echo "  $(basename $0) init --device <name> [--reference <mirror path>] [--manifest-dir <dir path>] [--internal]"
   echo "    --device <name>: target device name or 'all'"
   echo "    --reference <mirror path>: path to local mirror, initialized previously with '$(basename $0) mirror'"
+   echo "    --manifest-dir <dir path>: path to a directory containing repo manifest file(s)"
   echo "    --internal: fetch internal repositories, available only inside The Qt Company network."
   echo "Initialize local mirror:"
   echo "  $(basename $0) mirror"
@@ -62,6 +63,10 @@ while test -n "$1"; do
      shift
      REPO_URL="--repo-url $1"
      ;;
+    "--manifest-dir")
+      shift
+      MANIFEST_DIR=$1
+      ;;
    "--internal")
      INTERNAL="y"
      ;;
@@ -87,6 +92,10 @@ if [ -n "${REFERENCE}" ]; then
    REFERENCE="--reference $(readlink -f ${REFERENCE})"
 fi
+if [ -n "${MANIFEST_DIR}" ]; then
+    MANIFEST_DIR="$(readlink -f ${MANIFEST_DIR})"
+fi
 if [ -z "${REPO_URL}" ]; then
    REPO_URL="--repo-url git://github.com/theqtcompany/git-repo"
 fi
@@ -115,7 +124,7 @@ get_groups() {
    nitrogen6x|nitrogen7)
      PROJECT_GROUPS="boundary"
    ;;
-    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
+    imx6qdlsabresd|imx7dsabresd|imx7s-warp)
      PROJECT_GROUPS="fsl"
    ;;
    smarc-samx6i)
@@ -136,9 +145,12 @@ get_groups() {
    jetson-tx1|jetson-tx2|jetson-tk1)
      PROJECT_GROUPS="jetson"
    ;;
-    salvator-x|h3ulcb|m3ulcb)
+    salvator-x|h3ulcb|m3ulcb|ebisu)
      PROJECT_GROUPS="renesas-gen3"
    ;;
+    draak)
+      PROJECT_GROUPS="renesas-draak"
+    ;;
    *)
      echo "Unknown device configuration, including all meta layers"
      PROJECT_GROUPS="external"
@@ -158,9 +170,18 @@ list_devices() {
  done
 }
-mirror() {
+copy_manifests() {
  mkdir -p .repo/manifests
-  cp ${DIR}/scripts/manifest.xml .repo/manifests/
+  rm -f .repo/manifests/manifest*.xml
+  if [ -z "${MANIFEST_DIR}" ]; then
+      cp ${DIR}/scripts/manifest*.xml .repo/manifests/
+  else
+      cp ${MANIFEST_DIR}/manifest*.xml .repo/manifests/
+  fi
+}
+mirror() {
+  copy_manifests
  MANIFEST="manifest.xml"
  DEVICE=${DEVICE:-all}
  get_groups
@@ -176,9 +197,7 @@ init() {
  fi
  get_groups
-  mkdir -p .repo/manifests
+  copy_manifests
-  rm -f .repo/manifests/manifest*.xml
-  cp ${DIR}/scripts/manifest*.xml .repo/manifests
  if [ -f .repo/manifests/manifest_${DEVICE}.xml ]; then
    MANIFEST="manifest_${DEVICE}.xml"
  else
diff --git a/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample
index 8e52fa4..91e2add 100644
--- a/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend
+++ b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample
@@ -27,19 +27,28 @@
 ##
 ############################################################################
-SRCREV = "ba51e861f4444f51e7e83f778575a8146dc514d0"
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
-LIC_FILES_CHKSUM_remove = "\
+BBPATH = "${TOPDIR}"
-    file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \
+BBFILES ?= ""
-    file://LICENCE.Netronome;md5=cd2a3e6effe3cdf42731575b8e9477ed \
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
-    file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7 \
-    file://WHENCE;md5=038edbc9e744171d8b6235e0224028ba \
-"
-LIC_FILES_CHKSUM_append = "\
+BBLAYERS ?= " \
-    file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \
+  ${BSPDIR}/sources/poky/meta \
-    file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \
+  ${BSPDIR}/sources/poky/meta-poky \
-    file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \
+  ${BSPDIR}/sources/meta-renesas-D3/meta-rcar-gen3 \
-    file://WHENCE;md5=df953899bb1431b3991f36950d32894f \
+  ${BSPDIR}/sources/meta-linaro/meta-optee \
-"
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
+  ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
index 6f502ea..0836f5a 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample
@@ -39,7 +39,6 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen3 \
-  ${BSPDIR}/sources/meta-freescale \
  ${BSPDIR}/sources/meta-linaro/meta-optee \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
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 += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+    SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
    "
 SERIAL_CONSOLES = "115200;ttymxc0 \
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
index d570e3a..7a7728c 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.inc
 DEPLOY_CONF_NAME = "Toradex Apalis iMX8"
 SERIAL_CONSOLE = "115200 ttyLP1"
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
-RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
-RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
-BBMASK += "\
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
-    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
-    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
-    meta-freescale/recipes-graphics/wayland/weston \
-    "
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
-EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
-MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
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/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 += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
+    u-boot-${MACHINE}.img;${MACHINEDIR}/u-boot.img \
-    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
+    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 9090055..da92ad3 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -31,20 +31,18 @@ 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 += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+    u-boot-${MACHINE}.imx;${MACHINEDIR}/u-boot.imx \
    "
 PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index a5695f7..c7aa169 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -31,20 +31,18 @@ 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 += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
    "
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index e4c025b..ecd01da 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
@@ -33,11 +33,11 @@ DEPLOY_CONF_NAME = "Toradex Colibri VF"
 IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
-BOOT_SCRIPTS += " \
+IMAGE_BOOT_FILES += " \
-    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    u-boot-nand.imx;${MACHINEDIR}/u-boot-nand.imx \
    "
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf
new file mode 100644
index 0000000..9b5dbbc
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/draak.conf
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+include conf/distro/include/rcar-gen3.inc
+DEPLOY_CONF_NAME = "Renesas R-Car-D3 (Draak)"
+PREFERRED_PROVIDER_virtual/egl = "gles-user-module"
+PREFERRED_VERSION_libdrm = "2.4.91"
+WKS_FILE_DEPENDS_remove = "optee-os"
+QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec"
+BBMASK += "\
+    meta-rcar-gen3/recipes-multimedia/webp \
+    meta-rcar-gen3/recipes-connectivity/ppp \
+    meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \
+    meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
+    meta-rcar-gen3/recipes-multimedia/gstreamer \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/ebisu.conf
index af49983..24bdedd 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx6dlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/ebisu.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,6 +27,6 @@
 ##
 ############################################################################
-require imx6qsabresd.conf
+include conf/distro/include/rcar-gen3.inc
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Dual"
+DEPLOY_CONF_NAME = "Renesas R-Car-E3 Ebisu 4D"
diff --git a/meta-boot2qt-distro/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf
index b6125ae..619af16 100644
--- a/meta-boot2qt-distro/conf/distro/include/emulator.conf
+++ b/meta-boot2qt-distro/conf/distro/include/emulator.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,10 +27,7 @@
 ##
 ############################################################################
-IMAGE_CLASSES += "image-hdd"
+IMAGE_FSTYPES = "ext3 wic"
-IMAGE_ROOTFS_ALIGNMENT = "1048576"
-ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext3"
-IMAGE_FSTYPES = "ext3"
 QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
@@ -41,12 +38,13 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 PREFERRED_PROVIDER_virtual/egl = "qtglesstream-dummy-client"
 PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
+RDEPENDS_qtbase_pn-qtbase += "qtglesstream"
 KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
-DISTRO_FEATURES_remove = "webengine opengl wayland"
+DISTRO_FEATURES_remove = "webengine opengl wayland vulkan"
 MACHINE_EXTRA_INSTALL += "\
        mount-vboxsf \
        qtsystems \
-        qtglesstream \
        "
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
new file mode 100644
index 0000000..4e4256b
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -0,0 +1,79 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+include conf/distro/include/fsl.inc
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
+DISTRO_FEATURES_remove = "vulkan"
+RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
+RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
+BBMASK += "\
+    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
+    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
+    meta-freescale/recipes-graphics/wayland/weston \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-bsp/imx-test \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/connman \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-devtools/gdb \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-extended/logrotate \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/opencv \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/xorg-driver \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-kernel/cryptodev \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa \
+    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
+    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
+    "
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
+EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
+MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
+WKS_FILE = "imx8-uboot-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS += "imx-boot"
+BOOT_CONFIG_MACHINE_pn-imx-boot = "${BOOT_NAME}-${UBOOT_CONFIG}.bin"
+IMAGE_BOOT_FILES = "\
+    Image \
+    fsl-*.dtb \
+    hdmitxfw.bin \
+    "
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/imx6qdlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
new file mode 100644
index 0000000..5f3ddb3
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
@@ -0,0 +1,35 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+include conf/distro/include/fsl.inc
+include conf/distro/include/opencv.inc
+DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
+KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
deleted file mode 100644
index 683c601..0000000
--- a/meta-boot2qt-distro/conf/distro/include/imx6qsabresd.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-include conf/distro/include/fsl.inc
-include conf/distro/include/opencv.inc
-DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
-KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
-# add support for both imx6qsabresd and imx6dlsabresd
-KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
-                     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                    "
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index 1d30445..bcd4f7f 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -34,6 +34,8 @@ DEPLOY_CONF_NAME = "i.MX7S WaRP"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+PREFERRED_PROVIDER_virtual/kernel = "linux-warp7"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
 KERNEL_DEVICETREE = "imx7d-warp.dtb"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
index 6dfaa3a..a3a2c29 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
@@ -27,36 +27,8 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx8.inc
 DEPLOY_CONF_NAME = "NXP iMX8QM"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
-RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
-RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
-BBMASK += "\
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
-    meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
-    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
-    meta-freescale/recipes-graphics/wayland/weston \
-    "
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION', True).replace('_','-')}"
-EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
-MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
diff --git a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index 0c8200a..8d106ce 100644
--- a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,20 +31,18 @@ DEPLOY_CONF_NAME = "Intel NUC"
 DISTRO_FEATURES_remove = "usbgadget"
-IMAGE_CLASSES += "image_dd_efi"
+IMAGE_FSTYPES += "wic"
-IMAGE_FSTYPES += "ext3 dd"
 QBSP_IMAGE_CONTENT ?= "\
    ${IMAGE_LINK_NAME}.img \
    ${IMAGE_LINK_NAME}.conf \
    "
-INITRAMFS_IMAGE = "initramfs-basic"
+INITRAMFS_IMAGE = "core-image-minimal-initramfs"
 SYSVINIT_ENABLED_GETTYS = "1"
-MACHINE_EXTRA_INSTALL += "\
-        grub-efi-config \
-        "
 SERIAL_CONSOLES += "115200;ttyUSB0"
+WKS_FILE = "systemd-bootdisk-microcode-initramfs.wks"
+WKS_FILE_DEPENDS += "microcode-initramfs"
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index e3e0292..3212cb9 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,8 +27,6 @@
 ##
 ############################################################################
-PREFERRED_PROVIDER_libdrm-tegra = "libdrm-tegra"
 # use mmc0
 ROOTFS_DEVICE = "mmcblk1p1"
@@ -43,8 +41,3 @@ QBSP_IMAGE_CONTENT = "\
    ${IMAGE_LINK_NAME}.conf \
    ${IMAGE_LINK_NAME}.flasher.tar.gz \
    "
-BBMASK += "\
-    meta-tegra/recipes-graphics/drm \
-    meta-tegra/external/openembedded-layer/recipes-support/opencv \
-    "
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 \
+IMAGE_BOOT_FILES += "\
-                 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
+    upgrade.scr-${MACHINE};upgrade.scr \
-                 u-boot-nit6xlite1g-*.imx:u-boot.nit6xlite1g \
+    upgrade.scr-${MACHINE};6x_upgrade \
-                 u-boot-nitrogen6dl-*.imx:u-boot.nitrogen6dl \
+    u-boot-${MACHINE}.imx-nit6xlite;u-boot.nit6xlite \
-                 u-boot-nitrogen6dl2g-*.imx:u-boot.nitrogen6dl2g \
+    u-boot-${MACHINE}.imx-nit6xlite1g;u-boot.nit6xlite1g \
-                 u-boot-nitrogen6q2g-*.imx:u-boot.nitrogen6q2g \
+    u-boot-${MACHINE}.imx-nitrogen6dl;u-boot.nitrogen6dl \
-                 u-boot-nitrogen6q-*.imx:u-boot.nitrogen6q \
+    u-boot-${MACHINE}.imx-nitrogen6dl2g;u-boot.nitrogen6dl2g \
-                 u-boot-nitrogen6q_fl-*.imx:u-boot.nitrogen6q_fl \
+    u-boot-${MACHINE}.imx-nitrogen6q2g;u-boot.nitrogen6q2g \
-                 u-boot-nitrogen6qp_max-*.imx:u-boot.nitrogen6qp_max \
+    u-boot-${MACHINE}.imx-nitrogen6q;u-boot.nitrogen6q \
-                 u-boot-nitrogen6s1g-*.imx:u-boot.nitrogen6s1g \
+    u-boot-${MACHINE}.imx-nitrogen6q_fl;u-boot.nitrogen6q_fl \
-                 u-boot-nitrogen6s-*.imx:u-boot.nitrogen6s \
+    u-boot-${MACHINE}.imx-nitrogen6qp_max;u-boot.nitrogen6qp_max \
-                 u-boot-nitrogen6sx-*.imx:u-boot.nitrogen6sx \
+    u-boot-${MACHINE}.imx-nitrogen6s1g;u-boot.nitrogen6s1g \
-                 u-boot-nitrogen6_lum_dl1-*.imx:u-boot.nitrogen6_lum_dl1 \
+    u-boot-${MACHINE}.imx-nitrogen6s;u-boot.nitrogen6s \
-                 u-boot-nitrogen6_max-*.imx:u-boot.nitrogen6_max \
+    u-boot-${MACHINE}.imx-nitrogen6sx;u-boot.nitrogen6sx \
-                 u-boot-nitrogen6_vm1g-*.imx:u-boot.nitrogen6_vm1g \
+    u-boot-${MACHINE}.imx-nitrogen6_lum_dl1;u-boot.nitrogen6_lum_dl1 \
-                 u-boot-nitrogen6_vm-*.imx:u-boot.nitrogen6_vm \
+    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 \
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-boundary"
+    "
+WKS_FILE_DEPENDS += "u-boot"
 UBOOT_MACHINE = ""
 UBOOT_CONFIG ??= "nit6xlite nit6xlite1g \
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 1614b04..0d225fa 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
@@ -34,5 +34,5 @@ DEPLOY_CONF_NAME = "Boundary Devices i.MX7"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
-DISTRO_FEATURES_remove = "webengine wayland"
+DISTRO_FEATURES_remove = "webengine wayland vulkan"
diff --git a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc
new file mode 100644
index 0000000..ffb9741
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+# Configuration for boot2qt image without (L)GPLv3 components
+# Include in your conf/local.conf and add meta-gplv2 layer to your configuration
+# https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#migration-2.3-gplv2-and-gplv3-moves
+INCOMPATIBLE_LICENSE += "*GPLv3"
+IMAGE_FEATURES_remove_pn-b2qt-embedded-qt5-image = "tools-debug debug-tweaks"
+IMAGE_FEATURES_remove_pn-b2qt-automotive-qt5-image = "tools-debug debug-tweaks"
+RDEPENDS_packagegroup-b2qt-embedded-tools_remove_pn-packagegroup-b2qt-embedded-tools = "binutils binutils-symlinks perf"
+RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "ttf-freefont-mono"
+PACKAGECONFIG_remove_pn-qtvirtualkeyboard = "hunspell"
+PACKAGECONFIG_remove_pn-python3-pygobject = "cairo"
+# intel nuc specific changes
+IMAGE_FSTYPES_intel-corei7-64 = "tar.gz"
+MACHINE_EXTRA_INSTALL_remove_intel-corei7-64 = "grub-efi-config"
+QBSP_IMAGE_CONTENT_intel-corei7-64 = ""
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index 1d2cf9d..65faba4 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -47,10 +47,6 @@ VIDEO_CAMERA = "1"
 MACHINE_FEATURES += "pitft"
-BBMASK += "\
-    meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend \
-    "
 MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
 KERNEL_DEVICETREE += "\
diff --git a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
index 4350dda..6b99603 100644
--- a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
+++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,14 +27,28 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+IMAGE_FSTYPES += "wic"
+WKS_FILE = "sdimage-bootpart.wks"
+WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
+WKS_FILE_DEPENDS += "u-boot optee-os"
+IMAGE_BOOT_FILES = "\
+    Image \
+    r*.dtb \
+    "
 QBSP_IMAGE_CONTENT = "\
    ${IMAGE_LINK_NAME}.img \
    ${IMAGE_LINK_NAME}.conf \
+    bl2-${MACHINE}.srec \
+    bl31-${MACHINE}.srec \
+    tee-${MACHINE}.srec \
+    bootparam_sa0.srec \
+    cert_header_sa6.srec \
+    u-boot-elf-${MACHINE}.srec \
    "
-BOOT_SPACE = "16384"
+BOOT_SPACE = "32768"
 # uncomment following if using the evaluation drivers
 #DISTRO_FEATURES_append = " use_eva_pkg"
@@ -46,7 +60,7 @@ MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/
 #DISTRO_FEATURES_append = " pam"
 PREFERRED_PROVIDER_virtual/libgles1 = ""
 PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
-PREFERRED_PROVIDER_virtual/egl = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
 PREFERRED_PROVIDER_virtual/libgl = ""
 PREFERRED_PROVIDER_virtual/mesa = ""
 PREFERRED_PROVIDER_libgbm = "libgbm"
@@ -59,9 +73,5 @@ FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen3/${PN}:"
 BBMASK += "\
    meta-linaro/meta-optee/recipes-security/optee \
-    meta-rcar-gen3/recipes-connectivity/ppp \
    meta-rcar-gen3/recipes-core/packagegroups \
-    meta-rcar-gen3/recipes-graphics/mesa \
-    meta-rcar-gen3/recipes-multimedia/gstreamer \
-    meta-rcar-gen3/recipes-multimedia/webp \
    "
diff --git a/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
index 6c79d2c..dca0916 100644
--- a/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/tegra-t18x.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -33,7 +33,7 @@ QBSP_IMAGE_CONTENT = "\
    ${IMAGE_LINK_NAME}.tar.gz \
    "
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/drive-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 MACHINE_EXTRA_INSTALL += "\
@@ -55,6 +55,10 @@ MACHINE_EXTRA_INSTALL += "\
    libdrm-nv \
    "
+MACHINE_EXTRA_INSTALL_SDK = "\
+    tegra-drivers \
+    "
 PREFERRED_PROVIDER_virtual/libgles2 = "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles2-dev = "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl = "tegra-drivers"
@@ -66,16 +70,21 @@ PREFERRED_PROVIDER_virtual/mesa = "tegra-drivers"
 PREFERRED_PROVIDER_drm = "libdrm-nv"
 PREFERRED_PROVIDER_libdrm = "libdrm-nv"
 PREFERRED_PROVIDER_virtual/kernel = "linux-nvidia"
-PREFERRED_VERSION_linux-libc-headers = "4.4"
+PREFERRED_VERSION_linux-libc-headers = "4.9"
-PREFERRED_VERSION_nativesdk-linux-libc-headers = "4.4"
+PREFERRED_VERSION_nativesdk-linux-libc-headers = "4.9"
+DISTRO_FEATURES_remove = "vulkan"
 BBMASK += "\
-    meta-tegra/recipes-bsp/flashing \
+    meta-vib4/recipes-connectivity/bluez5 \
+    meta-vib4/recipes-connectivity/hostapd \
    meta-vib4/recipes-connectivity/openssl \
+    meta-vib4/recipes-connectivity/soft66 \
    meta-vib4/recipes-core/busybox \
    meta-vib4/recipes-core/glibc \
    meta-vib4/recipes-core/images \
    meta-vib4/recipes-core/kbd \
+    meta-vib4/recipes-core/llvm \
    meta-vib4/recipes-core/packagegroups \
    meta-vib4/recipes-core/toybox \
    meta-vib4/recipes-devtools/binutils \
@@ -91,6 +100,7 @@ BBMASK += "\
    meta-vib4/recipes-kernel/linux-libc-headers \
    meta-vib4/recipes-multimedia/audiomanager \
    meta-vib4/recipes-navigation/gpsd \
+    meta-vib4/recipes-navigation/navit \
    meta-vib4/recipes-support/keyutils \
    meta-vib4/recipes-support/lvm2 \
    meta-vib4/recipes-yocto-ivi \
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 += " \
+IMAGE_BOOT_FILES += " \
-    fwd_blk.img:flash_blk.img \
+    fwd_blk.img;flash_blk.img \
-    fwd_eth.img:flash_eth.img \
+    fwd_eth.img;flash_eth.img \
-    fwd_mmc.img:flash_mmc.img \
+    fwd_mmc.img;flash_mmc.img \
-    ${MACHINE}:${MACHINEDIR} \
+    ${MACHINE}/*;${MACHINEDIR}/ \
    "
-# fix: basehash value changed from ... to ....
-# The metadata is not deterministic and this needs to be fixed.
-rootfs_tezi_json[vardepsexclude] = "DATE"
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
index 9a218d9..d9ededa 100644
--- a/meta-boot2qt-distro/conf/layer.conf
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -39,3 +39,5 @@ BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bba
 BBFILE_COLLECTIONS += "b2qt-distro"
 BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt-distro = "20"
+LAYERSERIES_COMPAT_b2qt-distro = "sumo"
diff --git a/meta-boot2qt-distro/conf/machine/emulator.conf b/meta-boot2qt-distro/conf/machine/emulator.conf
index 2ab622e..cb18983 100644
--- a/meta-boot2qt-distro/conf/machine/emulator.conf
+++ b/meta-boot2qt-distro/conf/machine/emulator.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -50,3 +50,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
 MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"
 SYSTEMD_DEFAULT_TARGET = "custom.target"
+WKS_FILE = "directdisk.wks"
+do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
deleted file mode 100644
index fda246a..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
deleted file mode 100644
index f893746..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Tue, 20 Sep 2016 11:02:50 +0300
-Subject: [PATCH] Disable connman when booting over NFS
---
- src/connman.service.in | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/src/connman.service.in b/src/connman.service.in
-index 09dfec9..4132cf7 100644
--- a/src/connman.service.in
-+++ b/src/connman.service.in
-@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
- After=dbus.service network-pre.target systemd-sysusers.service
- Before=network.target multi-user.target shutdown.target
- Wants=network.target
-+ConditionKernelCommandLine=!root=/dev/nfs
- 
- [Service]
- Type=dbus
diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
deleted file mode 100644
index 8b46666..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
--- a/src/connman.service.in
-+++ b/src/connman.service.in
-@@ -7,6 +7,7 @@
- Before=network.target multi-user.target shutdown.target
- Wants=network.target
- Conflicts=systemd-resolved.service
-+ConditionKernelCommandLine=!root=/dev/nfs
- 
- [Service]
- Type=dbus
diff --git a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
deleted file mode 100644
index 9aa9648..0000000
--- a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 9 Sep 2015 13:37:28 +0300
-Subject: [PATCH] Support SYSROOT in c_rehash
-update-ca-certificates is ran during image creation, which in turn runs
-c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute
-location, c_rehash does not find the actual files. Add support for SYSROOT
-environment variable and use it to locate the actual files during image
-creation.
-Upstream-status: Pending
---
- tools/c_rehash.in | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index 92cb503..f3d2703 100644
--- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -7,6 +7,7 @@ my $dir;
- my $prefix;
- 
- my $openssl = $ENV{OPENSSL} || "openssl";
-+my $sysroot = $ENV{SYSROOT} || "";
- my $pwd;
- my $verbose = 0;
- my $symlink_exists=eval {symlink("",""); 1};
-@@ -101,16 +102,17 @@ sub hash_dir {
-                }
-        }
-        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
-+               $fullname = $sysroot . readlink($fname);
-                # Check to see if certificates and/or CRLs present.
-               my ($cert, $crl) = check_file($fname);
-+               my ($cert, $crl) = check_file($fullname);
-                if(!$cert && !$crl) {
-                        print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-                        next;
-                }
-               link_hash_cert($fname) if($cert);
-               link_hash_cert_old($fname) if($cert);
-               link_hash_crl($fname) if($crl);
-               link_hash_crl_old($fname) if($crl);
-+               link_hash_cert($fname, $fullname) if($cert);
-+               link_hash_cert_old($fname, $fullname) if($cert);
-+               link_hash_crl($fname, $fullname) if($crl);
-+               link_hash_crl_old($fname, $fullname) if($crl);
-        }
- }
- 
-@@ -143,9 +145,10 @@ sub check_file {
- 
- sub link_hash_cert {
-                my $fname = $_[0];
-               my $x509hash = $_[1] || '-subject_hash';
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
-+               my $fullname = $_[1];
-+               my $x509hash = $_[2] || '-subject_hash';
-+               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
-                chomp $hash;
-                chomp $fprint;
-                $fprint =~ s/^.*=//;
-@@ -176,11 +179,11 @@ sub link_hash_cert {
- }
- 
- sub link_hash_cert_old {
-               link_hash_cert($_[0], '-subject_hash_old');
-+               link_hash_cert($_[0], $_[1], '-subject_hash_old');
- }
- 
- sub link_hash_crl_old {
-               link_hash_crl($_[0], '-hash_old');
-+               link_hash_crl($_[0], $_[1], '-hash_old');
- }
- 
- 
-@@ -188,9 +191,10 @@ sub link_hash_crl_old {
- 
- sub link_hash_crl {
-                my $fname = $_[0];
-               my $crlhash = $_[1] || "-hash";
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
-+               my $fullname = $_[1];
-+               my $crlhash = $_[2] || "-hash";
-+               $fullname =~ s/'/'\\''/g;
-+               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
-                chomp $hash;
-                chomp $fprint;
-                $fprint =~ s/^.*=//;
-- 
-1.9.1
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 21552d7..c22a46c 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -43,6 +43,8 @@ python __anonymous() {
 RDEPENDS_${PN} = "\
    nativesdk-gperf \
+    nativesdk-cmake \
+    nativesdk-make \
    ${MACHINE_EXTRA_INSTALL_SDK_HOST} \
    "
diff --git a/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend b/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
deleted file mode 100644
index 8a069ed..0000000
--- a/meta-boot2qt-distro/recipes-devtools/binutils/binutils-cross_%.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-LDGOLD_sdkmingw32 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}"
diff --git a/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend b/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend
new file mode 100644
index 0000000..d3603bf
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend
@@ -0,0 +1,36 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+DEPENDS_remove_mingw32 = "ncurses"
+cmake_do_generate_toolchain_file_append_mingw32() {
+    cat >> ${WORKDIR}/toolchain.cmake <<EOF
+set( CMAKE_SYSTEM_NAME Windows )
+EOF
+}
diff --git a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
index 4e55e66..4e55e66 100644
--- a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
+++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
diff --git a/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend
index 1ac5f03..937c746 100644
--- a/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend
+++ b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-PACKAGE_INSTALL += "kernel-module-rtsx-pci-sdmmc"
+EXTRA_OECONF_append_mingw32 = " --without-cng"
diff --git a/meta-boot2qt-distro/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-boot2qt-distro/recipes-graphics/libsdl2/libsdl2_%.bbappend
new file mode 100644
index 0000000..bef2c7a
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 73a5078..f115070 100644
--- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -40,9 +40,10 @@ inherit qbsp
 PV := "${@d.getVar('PV', True).split('+')[0]}"
+VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
 QBSP_NAME = "Automotive ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
-QBSP_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}"
+QBSP_INSTALLER_COMPONENT = "automotive.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}"
 QBSP_SDK_TASK = "meta-toolchain-b2qt-automotive-qt5-sdk"
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
index 9f2d197..2adad90 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb
@@ -42,9 +42,9 @@ python __anonymous() {
 RDEPENDS_${PN} += "\
    nativesdk-packagegroup-b2qt-embedded-toolchain-host \
    nativesdk-qt3d-tools \
-    nativesdk-qtbase-tools \
+    nativesdk-qtbase \
-    nativesdk-qtbase-tools-dev \
+    nativesdk-qtbase-dev \
-    nativesdk-qtbase-tools-staticdev \
+    nativesdk-qtbase-staticdev \
    nativesdk-qtdeclarative-staticdev \
    nativesdk-qtdeclarative-tools \
    nativesdk-qtremoteobjects-tools \
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index c1d7f26..281d9b6 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -54,6 +54,7 @@ RDEPENDS_${PN} += " \
    qtdeclarative-dev \
    qtdeclarative-staticdev \
    qtdeviceutilities-dev \
+    qtgamepad-dev \
    qtgraphicaleffects-dev \
    qtimageformats-dev \
    qtlocation-dev \
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 38bddaa..6b78a82 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -46,6 +46,7 @@ RDEPENDS_${PN} += " \
    qtdeclarative \
    qtdeclarative-tools \
    qtdeviceutilities \
+    qtgamepad \
    qtgraphicaleffects \
    qtimageformats \
    qtlocation \
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtwebengine_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qt3d_git.bbappend
index cfd3a39..d2906b9 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qt3d_git.bbappend
@@ -27,5 +27,4 @@
 ##
 ############################################################################
-# QTBUG-70348
+PACKAGECONFIG += "qtgamepad"
-EXTRA_QMAKEVARS_PRE_append_arm = " CONFIG-=ltcg"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
new file mode 100644
index 0000000..a7ee953
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
@@ -0,0 +1,33 @@
+From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 23 Oct 2018 09:54:57 +0300
+Subject: [PATCH] Disable ltcg for host_build
+debug-prefix-map does not work correctly for static libraries
+when using ltcg, and since host_build compilations link agaist
+the libQt5Bootstrap.a library, it breaks source file packaging
+into debug packages.
+Also disable ltcg when compiling on Windows host platform,
+as GCC7 does not support lto with mingw.
+Disable also for static builds since those libraries can be linked
+on Windows host, where the lto built binaries won't work.
+Task-number: QTBUG-71230
+Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b
+Upstream-Status: Inappropriate [embedded specific]
+---
+ mkspecs/features/ltcg.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
+index ccf0226272..00118be872 100644
+--- a/mkspecs/features/ltcg.prf
+++ b/mkspecs/features/ltcg.prf
+@@ -1,4 +1,4 @@
+-CONFIG(release, debug|release) {
+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib {
+     # We need fat object files when creating static libraries on some platforms
+     # so the linker will know to load a particular object from the library
+     # in the first place. On others, we have special ar and nm to create the symbol
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index f24556e..5684832 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -36,10 +36,10 @@ PACKAGECONFIG += " \
    accessibility \
    cups \
    fontconfig \
-    freetype \
    getentropy \
    gif \
    glib \
+    harfbuzz \
    ico \
    icu \
    libinput \
@@ -64,6 +64,3 @@ SRC_URI += " \
 do_configure_prepend() {
    install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
-# make other libgbm providers possible
-PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm"
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
index ad4c7b8..b90d2f8 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
@@ -1,23 +1,24 @@
-From a7af02fe34bd8e067c7654ac366e19783b89e990 Mon Sep 17 00:00:00 2001
+From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Wed, 25 Oct 2017 13:22:16 +0300
 Subject: [PATCH] location: disable simulator content under plugins
 Does not build against more recent simulator
 ---
 src/plugins/position/position.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
-index 1687a9d..347963f 100644
+index 4453b8a3..c36a1b58 100644
 --- a/src/plugins/position/position.pro
 +++ b/src/plugins/position/position.pro
-@@ -5,7 +5,7 @@ QT_FOR_CONFIG += positioning-private
+@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue
- qtHaveModule(dbus):SUBDIRS += geoclue
+ qtHaveModule(dbus):SUBDIRS += geoclue2
 qtConfig(gypsy):SUBDIRS += gypsy
 qtConfig(winrt_geolocation):SUBDIRS += winrt
 -qtHaveModule(simulator):SUBDIRS += simulator
 +#qtHaveModule(simulator):SUBDIRS += simulator
 osx|ios|tvos:SUBDIRS += corelocation
 android:SUBDIRS += android
- win32:qtHaveModule(serialport):SUBDIRS += serialnmea
+ qtHaveModule(serialport):SUBDIRS += serialnmea
diff --git a/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend b/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend
new file mode 100644
index 0000000..6545343
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+PACKAGECONFIG_remove_class-nativesdk_mingw32 = "ssl"
+RRECOMMENDS_lib${BPN}_remove_mingw32 = "ca-certificates"
diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
index dedddf0..dba4af2 100644
--- a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
+++ b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,19 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://rngd.service \
-    "
-inherit systemd
-do_install_append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system
-        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service
-    fi
-}
-SYSTEMD_SERVICE_${PN} = "rngd.service"
diff --git a/meta-boot2qt-distro/wic/directdisk.wks b/meta-boot2qt-distro/wic/directdisk.wks
new file mode 100644
index 0000000..42bce62
--- /dev/null
+++ b/meta-boot2qt-distro/wic/directdisk.wks
@@ -0,0 +1,7 @@
+# short-description: Create a 'pcbios' direct disk image
+# long-description: Creates a partitioned legacy BIOS disk image that the user
+# can directly dd to boot media.
+include common.wks.inc
+bootloader  --timeout=0  --append="rootwait rootfstype=ext4 video=vesafb console=tty0 console=ttyS0,115200n8"
diff --git a/meta-boot2qt/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass
index 22c6ef7..4999d4d 100644
--- a/meta-boot2qt/classes/deploy-conf.bbclass
+++ b/meta-boot2qt/classes/deploy-conf.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,7 +29,7 @@
 inherit image_types
-IMAGE_DEPENDS_conf = "qtbase-native"
+do_image_conf[depends] += "qtbase-native:do_populate_sysroot"
 DEPLOY_CONF_NAME ?= "${MACHINE}"
 DEPLOY_CONF_TYPE ?= "Boot2Qt"
diff --git a/meta-boot2qt/classes/image-hdd.bbclass b/meta-boot2qt/classes/image-hdd.bbclass
deleted file mode 100644
index bceb1b1..0000000
--- a/meta-boot2qt/classes/image-hdd.bbclass
+++ /dev/null
@@ -1,48 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-VM_ROOTFS_TYPE = "ext3"
-ROOT_VM = "root=/dev/hda2"
-LABELS_VM = "boot"
-AUTO_SYSLINUXMENU = "0"
-SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
-inherit image_types image-vm
-create_hdd_image () {
-    cd ${IMGDEPLOYDIR}
-    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-    ln -s ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-}
-python do_hddimg() {
-        bb.build.exec_func('create_hdd_image', d)
-}
-addtask hddimg after do_bootdirectdisk before do_image_complete
diff --git a/meta-boot2qt/classes/image_dd.bbclass b/meta-boot2qt/classes/image_dd.bbclass
deleted file mode 100644
index e05536b..0000000
--- a/meta-boot2qt/classes/image_dd.bbclass
+++ /dev/null
@@ -1,87 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# This class is based on meta-freescale/classes/image_types_fsl.bbclass::generate_imx_sdcard()
-DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool."
-inherit image_types
-IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.img"
-# Boot partition size [in KiB]
-BOOT_SPACE ?= "8192"
-# Set alignment to 4MB [in KiB]
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-# Boot partition volume id
-BOOTDD_VOLUME_ID = "boot"
-IMAGE_TYPEDEP_dd = "ext3"
-IMAGE_DEPENDS_dd = "parted-native:do_populate_sysroot \
-                    dosfstools-native:do_populate_sysroot \
-                    mtools-native:do_populate_sysroot"
-image_dd_do_populate_boot() {
-}
-EXPORT_FUNCTIONS do_populate_boot
-IMAGE_CMD_dd() {
-    ROOTFS="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
-    # Align boot partition and calculate total binary image size
-    BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-    BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-    IMAGE_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})
-    # Initialize a sparse file
-    dd if=/dev/zero of=${IMAGE} bs=1 count=0 seek=$(expr 1024 \* ${IMAGE_SIZE})
-    # Create partition table
-    parted -s ${IMAGE} mklabel msdos
-    parted -s ${IMAGE} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
-    parted -s ${IMAGE} unit KiB mkpart primary $(expr  ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
-    parted -s ${IMAGE} set 1 boot on
-    parted ${IMAGE} print
-    # Create boot partition image
-    BOOT_BLOCKS=$(LC_ALL=C parted -s ${IMAGE} unit b print \
-                      | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }')
-    rm -f ${WORKDIR}/boot.img
-    mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-    do_populate_boot
-    # Burn Partitions
-    dd if=${WORKDIR}/boot.img of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-    dd if=${ROOTFS} of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-}
diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 970c34b..a894bca 100644
--- a/meta-boot2qt/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,27 +28,23 @@
 ############################################################################
 IMAGE_ROOTFS_EXTRA_SPACE = "100000"
-SDCARD_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
-SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard"
-IMAGE_CMD_sdcard_append() {
-    parted -s ${SDCARD} set 1 boot on
+IMAGE_CMD_wic_append() {
    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.sdcard ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.wic ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
-IMAGE_CMD_rpi-sdimg_append() {
+IMAGE_CMD_wic_append_emulator() {
-    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.wic ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
 }
-build_hddimg_append() {
+IMAGE_CMD_rpi-sdimg_append() {
    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.hddimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
-IMAGE_DEPENDS_tegraflash_append = " parted-native:do_populate_sysroot"
+do_image_tegraflash[depends] += "parted-native:do_populate_sysroot"
 create_tegraflash_pkg_prepend() {
    # Create partition table
    SDCARD=${IMGDEPLOYDIR}/${IMAGE_NAME}.img
@@ -88,7 +84,10 @@ END
    ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz
 }
-IMAGE_DEPENDS_teziimg_append = " qtbase-native:do_populate_sysroot"
+# fix: basehash value changed from ... to ....
+# The metadata is not deterministic and this needs to be fixed.
+do_image_teziimg[vardepsexclude] += "DATETIME DATE TIME"
+do_image_teziimg[depends] += "qtbase-native:do_populate_sysroot"
 IMAGE_CMD_teziimg_append() {
    ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png
    ln -fs ${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.tezi.tar
diff --git a/meta-boot2qt/classes/internal-build.bbclass b/meta-boot2qt/classes/internal-build.bbclass
index d842dcb..b1c581d 100644
--- a/meta-boot2qt/classes/internal-build.bbclass
+++ b/meta-boot2qt/classes/internal-build.bbclass
@@ -53,3 +53,7 @@ python enable_internal_build () {
 addhandler enable_internal_build
 enable_internal_build[eventmask] = "bb.event.ConfigParsed"
+# bring back base_conditional as Draak is using too old meta layer
+def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
+    return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d)
diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index e98565c..f35ebfe 100644
--- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -33,7 +33,7 @@ SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspe
 NATIVE_SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKPATHNATIVE}${libdir}/${QT_DIR_NAME}/mkspecs"
 SDK_MKSPEC = "devices/linux-oe-generic-g++"
 SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri"
-SDK_DYNAMIC_FLAGS = "-O. -pipe -g"
+MACHINE_CMAKE = "${SDK_OUTPUT}${SDKPATHNATIVE}${datadir}/cmake/OEToolchainConfig.cmake.d/${MACHINE}.cmake"
 create_sdk_files_append () {
    # Create the toolchain user's generic device mkspec
@@ -49,23 +49,17 @@ EOF
 #include "../../linux-g++/qplatformdefs.h"
 EOF
-    # Fill in the qdevice.pri file which will be used by the device mksspec
+    # Fill in the qdevice.pri file which will be used by the device mkspec
-    static_cflags="${TARGET_CFLAGS}"
-    static_cxxflags="${TARGET_CXXFLAGS}"
-    for i in ${SDK_DYNAMIC_FLAGS}; do
-        static_cflags=$(echo $static_cflags | sed -e "s/$i //")
-        static_cxxflags=$(echo $static_cxxflags | sed -e "s/$i //")
-    done
    echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI}
    echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} ${static_cflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH}" >> ${SDK_DEVICE_PRI}
    echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
    # Setup qt.conf to point at the device mkspec by default
    qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
    echo 'HostSpec = linux-g++' >> $qtconf
-    echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
+    echo 'TargetSpec = ${SDK_MKSPEC}' >> $qtconf
    # Update correct host_build ARCH and ABI to mkspecs/qconfig.pri
    QT_ARCH=$(grep QT_ARCH ${NATIVE_SDK_MKSPEC_DIR}/qconfig.pri | tail -1)
@@ -79,6 +73,18 @@ EOF
    # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it
    rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf
+    # Create and add cmake toolchain file
+    echo "set(CMAKE_SYSROOT ${SDKTARGETSYSROOT})" > ${MACHINE_CMAKE}
+    echo "set(CMAKE_PREFIX_PATH ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}/cmake)" >> ${MACHINE_CMAKE}
+    echo "set(compiler_flags \"${TARGET_CC_ARCH}\")" >> ${MACHINE_CMAKE}
+    echo "set(CMAKE_C_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE}
+    echo "set(CMAKE_CXX_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE}
+    echo "set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS})" >> ${MACHINE_CMAKE}
+}
+create_sdk_files_append_sdkmingw32 () {
+    echo "set(OE_QMAKE_BIN_SUFFIX .exe)" >> ${MACHINE_CMAKE}
 }
 create_qtcreator_configure_script () {
@@ -88,5 +94,7 @@ create_qtcreator_configure_script () {
    sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
 }
-create_qtcreator_configure_script_mingw32 () {
+create_qtcreator_configure_script_sdkmingw32 () {
+    # no script available for mingw
+    true
 }
diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
index 8d600d0..ad863da 100644
--- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
@@ -57,6 +57,6 @@ fakeroot tar_sdk_sdkmingw32() {
        if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then
                rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z
        fi
-        7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z sysroots
+        7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z *
 }
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index da790bf..7c6f7ef 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -33,6 +33,7 @@ FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:"
 SRC_URI = "\
    file://base_package.xml \
+    file://base_installscript.qs \
    file://image_package.xml \
    file://toolchain_package.xml \
    file://toolchain_installscript.qs \
@@ -144,6 +145,7 @@ prepare_qbsp() {
    mkdir -p ${COMPONENT_PATH}/meta
    cp ${WORKDIR}/base_package.xml ${COMPONENT_PATH}/meta/package.xml
+    cp ${WORKDIR}/base_installscript.qs ${COMPONENT_PATH}/meta/installscript.qs
    patch_installer_files ${COMPONENT_PATH}/meta
 }
@@ -154,10 +156,10 @@ create_qbsp() {
    repogen -p ${B}/pkg ${B}/repository
    mkdir -p ${DEPLOY_DIR}/qbsp
-    rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp
+    rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp
    cd ${B}/repository
-    7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp *
+    7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp *
 }
 python do_qbsp() {
diff --git a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-sanitizers_%.bbappend b/meta-boot2qt/classes/qt5-features.bbclass
index bbbffe3..89b3ee6 100644
--- a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-sanitizers_%.bbappend
+++ b/meta-boot2qt/classes/qt5-features.bbclass
@@ -27,7 +27,14 @@
 ##
 ############################################################################
-# aarch64 is compatible since GCC 5.1. See poky/master commit
+FEATURES := "${THISDIR}/features/${QT_MODULE}.opt"
-# b46caed47b0f74520cd9280bbe3e3676d9a19046
+do_configure[file-checksums] += "${FEATURES}:True"
-RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan"
-COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
+def qt_features(d):
+    featurefile = d.getVar('FEATURES', True)
+    with open(featurefile, 'r') as f:
+        features = f.read().replace('\n', ' ')
+    return features
+QT_CONFIG_FLAGS_append_class-target = " ${@qt_features(d)}"
+EXTRA_QMAKEVARS_CONFIGURE_append_class-target = " ${@qt_features(d)}"
diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf
index b8ba222..c51ea68 100644
--- a/meta-boot2qt/conf/layer.conf
+++ b/meta-boot2qt/conf/layer.conf
@@ -43,3 +43,5 @@ QT_LICENSE = "${LAYERDIR}/licenses/The-Qt-Company-Commercial"
 B2QTBASE = "${LAYERDIR}"
 HOSTTOOLS += "git-lfs"
+LAYERSERIES_COMPAT_b2qt = "sumo"
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 105e476..a7ea288 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -100,6 +100,7 @@ ${SDKTOOL} rmQt --id ${BASEID}.qt || true
 ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true
 ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true
 ${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
+${SDKTOOL} rmCMake --id ${BASEID}.cmake 2>/dev/null || true
 if [ -n "${REMOVEONLY}" ]; then
    echo "Kit removed: ${NAME}"
@@ -133,6 +134,11 @@ ${SDKTOOL} addQt \
    --type "Qdb.EmbeddedLinuxQt" \
    --qmake "$(type -p qmake)"
+${SDKTOOL} addCMake \
+    --id "${BASEID}.cmake" \
+    --name "CMake ${NAME}" \
+    --path "$(type -p cmake)"
 ${SDKTOOL} addKit \
    --id "${BASEID}.kit" \
    --name "${NAME}" \
@@ -143,6 +149,11 @@ ${SDKTOOL} addKit \
    --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
    --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
    --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
-    --mkspec "${MKSPEC}"
+    --mkspec "${MKSPEC}" \
+    --cmake "${BASEID}.cmake" \
+    --cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/share/cmake/OEToolchainConfig.cmake" \
+    --cmake-config "CMAKE_MAKE_PROGRAM:FILEPATH=$(type -p make)" \
+    --cmake-config "CMAKE_CXX_COMPILER:FILEPATH=$(type -p ${CXX})" \
+    --cmake-config "CMAKE_C_COMPILER:FILEPATH=$(type -p ${CC})"
 echo "Configured Qt Creator with new kit: ${NAME}"
diff --git a/meta-boot2qt/files/qbsp/base_installscript.qs b/meta-boot2qt/files/qbsp/base_installscript.qs
new file mode 100644
index 0000000..e6c5fbc
--- /dev/null
+++ b/meta-boot2qt/files/qbsp/base_installscript.qs
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Boot to Qt meta layer.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+var targetHost = "Linux";
+var currentHost = "Linux";
+function Component()
+{
+    if ("@SDKFILE@".indexOf("mingw32") >= 0)
+        targetHost = "Windows";
+    if (systemInfo.kernelType === "winnt")
+        currentHost = "Windows";
+    else if (systemInfo.kernelType === "darwin")
+        currentHost = "macOS";
+    if (currentHost != targetHost) {
+        component.enabled = false;
+        component.setValue("Default", false);
+        installer.componentByName(component.name + ".toolchain").setValue("Default", false);
+        installer.componentByName(component.name + ".toolchain").enabled = false;
+        installer.componentByName(component.name + ".system").setValue("Default", false);
+        installer.componentByName(component.name + ".system").enabled = false;
+        gui.currentPageWidget().completeChanged.connect(this, Component.prototype.completeChanged)
+    }
+}
+Component.prototype.completeChanged = function ()
+{
+    QMessageBox.critical("error", "Invalid QBSP package", "The selected QBSP supports only " + targetHost + " host platform.\nPlease restart the installer before continuing.");
+}
diff --git a/meta-boot2qt/files/qbsp/base_package.xml b/meta-boot2qt/files/qbsp/base_package.xml
index 5f16dfa..57b5076 100644
--- a/meta-boot2qt/files/qbsp/base_package.xml
+++ b/meta-boot2qt/files/qbsp/base_package.xml
@@ -5,4 +5,6 @@
  <DisplayName>@TARGET@</DisplayName>
  <Description>@NAME@ for @TARGET@</Description>
  <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
+  <Script>installscript.qs</Script>
+  <Default>true</Default>
 </Package>
diff --git a/meta-boot2qt/files/qbsp/image_package.xml b/meta-boot2qt/files/qbsp/image_package.xml
index 27e5f2e..326b443 100644
--- a/meta-boot2qt/files/qbsp/image_package.xml
+++ b/meta-boot2qt/files/qbsp/image_package.xml
@@ -5,4 +5,5 @@
  <DisplayName>@TARGET@ Linux System</DisplayName>
  <Description>System image for @TARGET@ hardware</Description>
  <DownloadableArchives>image.7z</DownloadableArchives>
+  <Default>true</Default>
 </Package>
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 4afab71..feee04d 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Boot to Qt meta layer.
@@ -56,17 +56,22 @@ Component.prototype.createOperations = function()
        component.addOperation("Replace",
                                path + "/sysroots/i686-pokysdk-mingw32/usr/bin/qt.conf",
                                sdkPath, path);
+        component.addOperation("Replace",
+                                path + "/sysroots/i686-pokysdk-mingw32/usr/share/cmake/OEToolchainConfig.cmake.d/" + device + ".cmake",
+                                sdkPath, path);
    }
    var basecomponent = component.name.substring(0, component.name.lastIndexOf("."));
    var toolchainId = "ProjectExplorer.ToolChain.Gcc:" + component.name;
    var debuggerId = basecomponent + ".gdb";
    var qtId = basecomponent + ".qt";
+    var cmakeId = basecomponent + ".cmake";
    var icon = installer.value("B2QtDeviceIcon");
    var executableExt = "";
    var hostSysroot = "x86_64-pokysdk-linux";
    if (systemInfo.kernelType === "winnt") {
        executableExt = ".exe";
        hostSysroot = "i686-pokysdk-mingw32";
+        toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name;
    }
    component.addOperation("Execute",
@@ -109,6 +114,14 @@ Component.prototype.createOperations = function()
         "@SDKToolBinary@", "rmQt", "--id", qtId]);
    component.addOperation("Execute",
+        ["@SDKToolBinary@", "addCMake",
+        "--id", cmakeId,
+        "--name", "CMake (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/cmake" + executableExt,
+        "UNDOEXECUTE",
+        "@SDKToolBinary@", "rmCMake", "--id", cmakeId]);
+    component.addOperation("Execute",
        ["@SDKToolBinary@", "addKit",
         "--id", basecomponent,
         "--name", platform + " " + target,
@@ -120,6 +133,11 @@ Component.prototype.createOperations = function()
         "--Ctoolchain", toolchainId + ".gcc",
         "--Cxxtoolchain", toolchainId + ".g++",
         "--icon", icon,
+         "--cmake", cmakeId,
+         "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/share/cmake/OEToolchainConfig.cmake",
+         "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/make" + executableExt,
+         "--cmake-config", "CMAKE_CXX_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
+         "--cmake-config", "CMAKE_C_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmKit", "--id", basecomponent]);
 }
diff --git a/meta-boot2qt/files/qbsp/toolchain_package.xml b/meta-boot2qt/files/qbsp/toolchain_package.xml
index 166e09b..89a73b7 100644
--- a/meta-boot2qt/files/qbsp/toolchain_package.xml
+++ b/meta-boot2qt/files/qbsp/toolchain_package.xml
@@ -7,4 +7,5 @@
  <DownloadableArchives>toolchain.7z</DownloadableArchives>
  <Dependencies>qt.tools.qtcreator</Dependencies>
  <Script>installscript.qs</Script>
+  <Default>true</Default>
 </Package>
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
deleted file mode 100644
index 94eb39b..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ROOT_MOUNT="/sysroot/"
-ROOT_DEVICE=""
-early_setup() {
-    mkdir -p /proc
-    mkdir -p /sys
-    mount -t proc proc /proc
-    mount -t sysfs sysfs /sys
-    mount -t devtmpfs none /dev
-    mkdir -p /run
-    mkdir -p /var/run
-}
-read_args() {
-    for arg in $(cat /proc/cmdline); do
-        value=$(echo ${arg} | cut -s -f2- -d '=')
-        case $arg in
-            root=*)
-                root=$value
-                ;;
-            debugshell*)
-                if [ -z "$value" ]; then
-                     shelltimeout=30
-                else
-                     shelltimeout=$value
-                fi
-                ;;
-        esac
-    done
-    if [ -z "$root" ] ; then
-        debug_shell "No root= specified via kernel command line."
-    else
-        case $root in
-            LABEL=*)
-                label=${root#LABEL=}
-                ;;
-            *)
-                debug_shell "This init script only supports root=LABEL=* for specifying root file system, but root=$root was provided."
-                ;;
-        esac
-    fi
-}
-mount_rootfs() {
-    mkdir -p $ROOT_MOUNT
-    mount $ROOT_DEVICE $ROOT_MOUNT
-    mount -n --move /proc $ROOT_MOUNT/proc
-    mount -n --move /sys $ROOT_MOUNT/sys
-    mount -n --move /dev $ROOT_MOUNT/dev
-    exec switch_root $ROOT_MOUNT /sbin/init || debug_shell "Couldn't switch_root."
-}
-switch_real_root() {
-    echo "Searching for media..."
-    C=0
-    while true
-    do
-    rootfs=$(findfs LABEL=$label)
-    if [ -n "$rootfs" ] ; then
-        ROOT_DEVICE=$rootfs
-        mount_rootfs
-    fi
-    # don't wait for more than $shelltimeout seconds, if it's set
-    if [ -n "$shelltimeout" ]; then
-        echo -n " " $(( $shelltimeout - $C ))
-        if [ $C -ge $shelltimeout ]; then
-            debug_shell "Cannot find root file system."
-        fi
-        C=$(( C + 1 ))
-    fi
-    sleep 1
-    done
-}
-debug_shell() {
-    echo ${1}
-    echo "Dropping to a shell."
-    exec sh
-}
-main() {
-    early_setup
-    read_args
-    if [ -f init-device ]; then
-        source init-device
-    fi
-    switch_real_root
-}
-main
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
deleted file mode 100644
index 39d590a..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-SUMMARY = "Simple init script that mounts root filesystem by label."
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-SRC_URI = "file://init.sh"
-S = "${WORKDIR}"
-do_install () {
-    install -m 0755 ${WORKDIR}/init.sh ${D}/init
-}
-inherit allarch
-FILES_${PN} += "/init"
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
deleted file mode 100644
index 283a681..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-# findfs from busybox fails to do its jobs, the full version from util-linux-findfs works fine
-PACKAGE_INSTALL = "init-basic busybox util-linux-findfs ${ROOTFS_BOOTSTRAP_INSTALL}"
-# Do not pollute the initramfs image with rootfs features
-IMAGE_FEATURES = ""
-export IMAGE_BASENAME = "initramfs-basic"
-IMAGE_LINGUAS = ""
-IMAGE_FSTYPES = "cpio.gz"
-inherit core-image
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
index 1eb2652..6dba661 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -36,13 +36,13 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.
          file://mount-vboxsf.service \
          "
-SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd"
+SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
-SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36"
+SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders"
 do_compile() {
-    ${CC} ${LDFLAGS} mount.vboxsf.c vbsfmount.c -o mount.vboxsf
+    ${CC} ${LDFLAGS} -I../../../../../include -DIN_RING3 mount.vboxsf.c vbsfmount.c -o mount.vboxsf
 }
 do_install() {
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
index 752d8cb..a727c6f 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -38,18 +38,20 @@ PR = "${MACHINE_KERNEL_PR}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
-SRC_URI[md5sum] = "37ebbd51370841eed8ab80f2f38446d6"
+SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
-SRC_URI[sha256sum] = "78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7"
+SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
 S = "${WORKDIR}/vbox"
 export KERN_DIR="${STAGING_KERNEL_DIR}"
+export KERN_VER="${KERNEL_VERSION}"
 export KBUILD_VERBOSE="1"
 export BUILD_TARGET_ARCH="${ARCH}"
 do_compile_prepend() {
-    ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz
+    ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules.sh ${WORKDIR}/vbox.tar.gz
    tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox
+    find ${WORKDIR}/vbox -name Makefile.include.header | xargs sed -i -e '/KERN_DIR :=/d'
 }
 do_install() {
diff --git a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
index 3f2f680..6f14c6e 100644
--- a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
@@ -8,12 +8,13 @@ inherit cmake_qt5
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
-BRANCH = "5.11"
+BRANCH = "5.12"
-SRCREV = "3a35d9ec64a3c32503c1252edc2608ad49f05b40"
+SRCREV = "f9cb19adc34684bbca56fd6eb3903e041764e742"
 PV = "${BRANCH}+git${SRCPV}"
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \
-           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)} \
+           elfutils"
 S = "${WORKDIR}/git"
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index 061e3a8..3ad29b1 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -39,12 +39,13 @@ inherit qt5-module systemd
 require recipes-qt/qt5/qt5-git.inc
 QT_GIT_PROJECT = "qt-apps"
+QT_MODULE_BRANCH = "dev"
 SRC_URI += " \
    file://neptune.service \
    "
-SRCREV = "4509d7d8a1e5675cebf17ffeb74ba72a90ed296f"
+SRCREV = "d8332c73ccda36e1da2661317d7ed3c787b17c68"
 QMAKE_PROFILES = "${S}/neptune3-ui.pro"
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index 76cd9b1..d87dd13 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc
 QT_GIT_PROJECT = "qt-apps"
-SRCREV = "a239d45ce6e185eb0a3b5e947698a8f08e783189"
+SRCREV = "e400161c6ec932c180e8b9fe5e5d00a593ee254a"
 DEPENDS = "qtbase qtdeclarative"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index 82a9bcd..89fcaa2 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -34,7 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717"
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
-SRCREV = "201656bedec57dbd22b3fc3089148e6c7453875c"
+QT_MODULE_BRANCH = "dev"
+SRCREV = "941d493f47d1e15430ed062ea0aa4b1f7c087a04"
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
           ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
index 9f6c0c0..256f706 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch
@@ -1,4 +1,4 @@
-From b4ed8c9d4a391771cba485bfa685147126260dc2 Mon Sep 17 00:00:00 2001
+From 2d99a2a0c728cb28332fb35dac3af88b0f256116 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 7 Sep 2017 10:24:11 +0300
 Subject: [PATCH] Use QT_HOST_BINS/get for getting correct path
@@ -8,22 +8,26 @@ the EffectivePath instead of installation path.
 Change-Id: I3e9c04019c432e182dcb5c0898275173f20de1e2
 ---
- mkspecs/features/ivigenerator.prf | 4 ++--
+ mkspecs/features/ivigenerator.prf | 4 +++-
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf
-index 65c497e..7634355 100644
+index 8d36aae..149116c 100644
 --- a/mkspecs/features/ivigenerator.prf
 +++ b/mkspecs/features/ivigenerator.prf
-@@ -31,9 +31,9 @@ QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml
+@@ -36,9 +36,11 @@ equals(QMAKE_HOST.os, Windows): ENV = chcp 65001 &&
- OTHER_FILES += $$QFACE_FILE
+ else: ENV = LC_ALL="en_US.UTF-8"
 
 # Detect whether we are using the feature inside the qtivi repository
 -VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv
 +VIRTUALENV_PATH = $$[QT_HOST_BINS/get]/ivigenerator/qtivi_qface_virtualenv
 INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv
-IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator
+ IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator
 +IVI_GENERATOR_PATH = $$[QT_HOST_BINS/get]/ivigenerator
+
 QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT))
 
 # Try to use the internal virtualenv when building qtivi
+-- 
+2.17.1
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index 8665142..01a7d4b 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -43,15 +43,16 @@ inherit qt5-module
 inherit python3native
 require recipes-qt/qt5/qt5-git.inc
-QT_MODULE_BRANCH_QFACE = "upstream/develop"
+QT_MODULE_BRANCH = "dev"
+QT_MODULE_BRANCH_QFACE = "upstream/master"
 SRC_URI += " \
    ${QT_GIT}/qtivi-qface.git;name=qface;branch=${QT_MODULE_BRANCH_QFACE};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/qface \
    file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \
 "
-SRCREV_qtivi = "c3da57cf0c7213120803fe63003d0cc14d14f871"
+SRCREV_qtivi = "142d7174863c2acf2792ba723c8dd273f8d07b22"
-SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8"
+SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e"
 SRCREV = "${SRCREV_qtivi}"
 SRCREV_FORMAT = "qtivi_qface"
@@ -109,4 +110,4 @@ BBCLASSEXTEND += "native nativesdk"
 INSANE_SKIP_${PN}_class-native = "already-stripped"
 INSANE_SKIP_${PN}_class-nativesdk = "already-stripped"
-INSANE_SKIP_${PN}-tools_class-nativesdk = "staticdev"
+INSANE_SKIP_${PN}-tools_class-nativesdk = "staticdev file-rdeps libdir build-deps"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf
new file mode 100644
index 0000000..38d06e6
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf
@@ -0,0 +1,9 @@
+env=QMLSCENE_DEVICE=softwarecontext
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_QPA_PLATFORM=linuxfb
+env=QSG_RENDER_LOOP=basic
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QUICK_CONTROLS_1_STYLE=Flat
+env=XDG_RUNTIME_DIR=/run/user/0
+env=QTWEBENGINE_DISABLE_SANDBOX=1
+base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf
new file mode 100644
index 0000000..85227c2
--- /dev/null
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf
@@ -0,0 +1,8 @@
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QPA_EGLFS_FORCE888=0
+env=QT_QUICK_CONTROLS_1_STYLE=Flat
+env=XDG_RUNTIME_DIR=/run/user/0
+env=QSG_RENDER_LOOP=basic
+env=QTWEBENGINE_DISABLE_SANDBOX=1
+base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index 3900abb..6e1d324 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -42,11 +42,11 @@ SRC_URI = " \
    https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
    "
-PV = "5.11.2+git${SRCPV}"
+PV = "5.12.0+git${SRCPV}"
-BRANCH = "5.11"
+BRANCH = "5.12"
-SRCREV = "ca03367f33d6430d3ddbbd70edf832bced59ff74"
+SRCREV = "0fad7db4b7d34972b5b11fe31ceede43b3e6d0ea"
 SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
 SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index cda1ac7..9575045 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -43,7 +43,7 @@ SRC_URI += " \
    file://ebikedata.service \
    "
-SRCREV = "ce4d3833f5193168fb61392d08f61e73997632eb"
+SRCREV = "64f65e26feb4f6b0b3ac31cfc4e22c5971c1c41d"
 DEPENDS = "\
    qtbase qtdeclarative qtquickcontrols2 \
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
index 15981b0..15e048f 100755
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb/qdbd-init.sh
@@ -46,19 +46,6 @@ GADGET_CONFIG=$CONFIGFS_PATH/usb_gadget/g1
 . /etc/default/qdbd
-initialize_gadget() {
-    # Initialize gadget with first UDC driver
-    for driverpath in /sys/class/udc/*; do
-        drivername=`basename $driverpath`
-        echo "$drivername" > $GADGET_CONFIG/UDC
-        break
-    done
-}
-disable_gadget() {
-    echo "" > $GADGET_CONFIG/UDC
-}
 case "$1" in
 start)
    b2qt-gadget-network.sh --reset
@@ -86,11 +73,8 @@ start)
    mount -t functionfs qdb /dev/usb-ffs/qdb -o uid=0,gid=0
    shift
    start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
-    sleep 1
-    initialize_gadget
    ;;
 stop)
-    disable_gadget
    start-stop-daemon --stop --quiet --exec $DAEMON
    sleep 1
    umount /dev/usb-ffs/qdb
@@ -104,14 +88,11 @@ stop)
    rmdir $GADGET_CONFIG
    ;;
 restart)
-    disable_gadget
    start-stop-daemon --stop --quiet --exec $DAEMON
    b2qt-gadget-network.sh --reset
    sleep 1
    shift
    start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
-    sleep 1
-    initialize_gadget
    ;;
 *)
    echo "Usage: $0 {start|stop|restart}"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
index 5eebaea..ceeb17e 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb
@@ -45,8 +45,8 @@ SRC_URI += "file://b2qt-gadget-network.sh \
           file://qdbd-init.sh \
          "
-SRCREV = "69f95b6a8d2ca0912a8d502a2b6871109725731e"
+SRCREV = "59ea3a9ed6c10248ecdfb7cf111c3b7d1f70cba6"
-PV = "1.1.0+git${SRCPV}"
+PV = "1.2.0+git${SRCPV}"
 REQUIRED_DISTRO_FEATURES = "systemd"
 DEPENDS = "qtbase"
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index 6313c5c..a669f5e 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "0ecd391912f6338d5aef6105600fc8c321c83bd8"
+SRCREV = "4b4ed3262fafc93fe510f27f09fa45393eb14852"
 DEPENDS = "\
    qtbase qtdeclarative qtconnectivity qtdeclarative-native \
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
index f52a419..74e2652 100644
--- a/meta-fsl-extras/conf/layer.conf
+++ b/meta-fsl-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_fsl"
 BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_fsl = "20"
+LAYERSERIES_COMPAT_b2qt_fsl = "sumo"
diff --git a/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx.inc
new file mode 100644
index 0000000..5407a5a
--- /dev/null
+++ b/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -0,0 +1,81 @@
+SUMMARY = "Freescale IMX firmware"
+DESCRIPTION = "Freescale IMX firmware such as for the VPU"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
+PE = "1"
+#BRCM firmware git
+SRCBRANCH ?= "master"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git "
+inherit fsl-eula-unpack allarch
+do_install() {
+    install -d ${D}${base_libdir}/firmware/imx
+    install -d ${D}${base_libdir}/firmware/bcm
+    install -d ${D}${sysconfdir}/firmware
+    cp -rfv firmware/* ${D}${base_libdir}/firmware/
+    #1BW_BCM43340
+    install -d ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
+    cp -rfv git/brcm/1BW_BCM43340/*.bin ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
+    cp -rfv git/brcm/1BW_BCM43340/*.cal ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
+    cp -rfv git/brcm/1BW_BCM43340/*.hcd ${D}${sysconfdir}/firmware/
+    #1DX_BCM4343W
+    install -d ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
+    cp -rfv git/brcm/1DX_BCM4343W/*.bin ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
+    cp -rfv git/brcm/1DX_BCM4343W/*.cal ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
+    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
+    #SN8000_BCM43362
+    install -d ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
+    cp -rfv git/brcm/SN8000_BCM43362/*.bin ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
+    cp -rfv git/brcm/SN8000_BCM43362/*.cal ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
+    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
+    #ZP_BCM4339
+    install -d ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
+    cp -rfv git/brcm/ZP_BCM4339/*.bin ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
+    cp -rfv git/brcm/ZP_BCM4339/*.cal ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
+    cp -rfv git/brcm/ZP_BCM4339/*.hcd ${D}${sysconfdir}/firmware/
+    mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
+    mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
+    find ${D}${base_libdir}/firmware -type f -exec chmod 644 '{}' ';'
+    find ${D}${base_libdir}/firmware -type f -exec chown root:root '{}' ';'
+    # Remove files not going to be installed
+    find ${D}${base_libdir}/firmware/ -name '*.mk' -exec rm '{}' ';'
+}
+python populate_packages_prepend() {
+    vpudir = bb.data.expand('${base_libdir}/firmware/vpu', d)
+    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
+                      output_pattern='firmware-imx-vpu-%s',
+                      description='Freescale IMX Firmware %s',
+                      extra_depends='',
+                      prepend=True)
+    sdmadir = bb.data.expand('${base_libdir}/firmware/sdma', d)
+    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
+                      output_pattern='firmware-imx-sdma-%s',
+                      description='Freescale IMX Firmware %s',
+                      extra_depends='',
+                      prepend=True)
+}
+ALLOW_EMPTY_${PN} = "1"
+PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
+PACKAGES =+ "${PN}-epdc ${PN}-brcm"
+FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
+FILES_${PN}-brcm = "${base_libdir}/firmware/bcm/*/*.bin ${base_libdir}/firmware/bcm/*/*.cal ${sysconfdir}/firmware/"
diff --git a/meta-fsl-extras/recipes-bsp/imx-vpu/imx-vpu.inc b/meta-fsl-extras/recipes-bsp/imx-vpu/imx-vpu.inc
new file mode 100644
index 0000000..7b33956
--- /dev/null
+++ b/meta-fsl-extras/recipes-bsp/imx-vpu/imx-vpu.inc
@@ -0,0 +1,28 @@
+# Copyright (C) 2013-2017 O.S. Systems Software LTDA.
+# Copyright (C) 2013 Freescale Semiconductor
+# Copyright 2017 NXP
+DESCRIPTION = "Freescale VPU library"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
+DEPENDS = "virtual/kernel"
+PROVIDES = "virtual/imxvpu"
+inherit fsl-eula-unpack
+PLATFORM_mx6 = "IMX6Q"
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+do_compile () {
+    INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
+    oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
+}
+do_install () {
+    oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
+}
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-fsl-extras/recipes/imx-dpu-g2d/imx-dpu-g2d_%.bbappend b/meta-fsl-extras/recipes/imx-dpu-g2d/imx-dpu-g2d_%.bbappend
new file mode 100644
index 0000000..4a99874
--- /dev/null
+++ b/meta-fsl-extras/recipes/imx-dpu-g2d/imx-dpu-g2d_%.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+# dependency missing in meta-fsl-bsp-release
+RDEPENDS_${PN} += "libdrm"
diff --git a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend b/meta-fsl-extras/recipes/libsdl2/libsdl2_%.bbappend
index ca8f573..4d6a52b 100644
--- a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
+++ b/meta-fsl-extras/recipes/libsdl2/libsdl2_%.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRC_URI_remove = "file://ppp-fix-building-with-linux-4.8.patch"
+CFLAGS += "-DLINUX=1 -DEGL_API_FB=1"
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
index da4b2c1..9bf3498 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
@@ -33,7 +33,7 @@ SRC_URI += " \
        "
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 do_preconfigure_prepend() {
    echo "CONFIG_HID_MULTITOUCH=m"              >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
index 74fa4ab..a668575 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -28,7 +28,7 @@
 ############################################################################
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 do_preconfigure_prepend() {
    # FunctionFS for qdbd
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index 47fd1bf..9b4cc9b 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -28,7 +28,10 @@
 ############################################################################
 # kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+# remove from imx8 kernel build
+SRC_URI_remove = " file://Install-dma-buf-h.patch"
 do_preconfigure_prepend() {
    # FunctionFS for qdbd
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 58dc715..4850f8a 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,12 +27,14 @@
 ##
 ############################################################################
-RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree"
+# remove from imx8 kernel build
+SRC_URI_remove = " file://Install-dma-buf-h.patch"
 do_preconfigure_prepend () {
    # FunctionFS for qdbd
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-    echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
    # Enable uprobe for profiling
    echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7/defconfig b/meta-fsl-extras/recipes/linux/linux-warp7/defconfig
new file mode 100644
index 0000000..267fa97
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-warp7/defconfig
@@ -0,0 +1,444 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX50=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX7D=y
+CONFIG_SOC_VF610=y
+# CONFIG_SWP_EMULATE is not set
+CONFIG_SMP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_HIGHMEM=y
+CONFIG_CMA=y
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_ARM_IMX6Q_CPUFREQ=y
+CONFIG_ARM_IMX7D_CPUFREQ=y
+CONFIG_CPU_IDLE=y
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_IPV6=y
+CONFIG_VLAN_8021Q=y
+CONFIG_LLC2=y
+CONFIG_CAN=y
+CONFIG_CAN_FLEXCAN=y
+CONFIG_CAN_M_CAN=y
+CONFIG_BT=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=y
+# CONFIG_BT_HCIBTUSB is not set
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+CONFIG_BT_HCIBCM203X=y
+# CONFIG_BT_ATH3K is not set
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_IMX_WEIM=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_SPI_FSL_QUADSPI=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_SENSORS_FXOS8700=y
+CONFIG_SENSORS_FXAS2100X=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
+CONFIG_PATA_IMX=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+CONFIG_CS89x0=y
+CONFIG_CS89x0_PLATFORM=y
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_SMC91X=y
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_MICREL_PHY=y
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_BCMDHD=m
+CONFIG_BCMDHD_SDIO=y
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/1DX_BCM4343W/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/1DX_BCM4343W/bcmdhd.1DX.SDIO.cal"
+# CONFIG_RTL_CARDS is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_HIMAX_HX852xES=y
+CONFIG_TOUCHSCREEN_HIMAX_I2C=y
+CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_ELAN_TS=y
+CONFIG_TOUCHSCREEN_MAX11801=y
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
+CONFIG_TOUCHSCREEN_MC13783=y
+CONFIG_TOUCHSCREEN_TSC2007=y
+CONFIG_TOUCHSCREEN_STMPE=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MMA8450=y
+CONFIG_SENSOR_FXLS8471=y
+CONFIG_INPUT_ISL29023=y
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_FSL_LPUART=y
+CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+CONFIG_FSL_OTP=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_IMX=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX732X=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_74X164=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_SABRESD_MAX8903=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_SENSORS_MAX17135=y
+CONFIG_SENSORS_MAG3110=y
+CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
+CONFIG_IMX_THERMAL=y
+CONFIG_DEVICE_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_IMX2_WDT=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_MC13XXX_SPI=y
+CONFIG_MFD_MC13XXX_I2C=y
+CONFIG_MFD_MAX17135=y
+CONFIG_MFD_SI476X_CORE=y
+CONFIG_MFD_STMPE=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_MAX17135=y
+CONFIG_REGULATOR_MC13783=y
+CONFIG_REGULATOR_MC13892=y
+CONFIG_REGULATOR_PFUZE100=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_CAPTURE=m
+CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5642=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_VIDEO_MXC_IPU_OUTPUT=y
+CONFIG_VIDEO_MXC_PXP_V4L2=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_VADC=m
+CONFIG_MXC_MIPI_CSI=m
+CONFIG_MXC_CAMERA_OV5647_MIPI=m
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_MX3=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
+CONFIG_RADIO_SI476X=y
+CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_DRM=y
+CONFIG_DRM_VIVANTE=y
+CONFIG_FB=y
+CONFIG_FB_MXS=y
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXC_MIPI_DSI=y
+CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
+CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
+CONFIG_FB_MXC_TRULY_PANEL_TFT3P5079E=y
+CONFIG_FB_MXC_TRULY_PANEL_TFT3P5581E=y
+CONFIG_FB_MXC_TRULY_PANEL_TDO_QVGA0150A90049=y
+CONFIG_FB_MXC_TRULY_PANEL_TFT320RND=y
+CONFIG_FB_MXC_LDB=y
+CONFIG_FB_MXC_HDMI=y
+CONFIG_FB_MXS_SII902X=y
+CONFIG_FB_MXC_DCIC=m
+CONFIG_HANNSTAR_CABC=y
+CONFIG_FB_MXC_EINK_PANEL=y
+CONFIG_FB_MXC_EINK_V2_PANEL=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_SOC=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_EUKREA_TLV320=y
+CONFIG_SND_SOC_IMX_WM8960=y
+CONFIG_SND_SOC_IMX_SII902X=y
+CONFIG_SND_SOC_IMX_WM8958=y
+CONFIG_SND_SOC_IMX_CS42888=y
+CONFIG_SND_SOC_IMX_WM8962=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MQS=y
+CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_SND_SOC_IMX_MC13783=y
+CONFIG_SND_SOC_IMX_SI476X=y
+CONFIG_SND_SOC_IMX_HDMI=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_USB=y
+CONFIG_USB_OTG_WHITELIST=y
+CONFIG_USB_OTG_FSM=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_HCD_TEST_MODE=y
+CONFIG_USB_ACM=m
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_EHSET_TEST_FIXTURE=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MXC_IPU=y
+CONFIG_MXC_IPU_V3_PRE=y
+CONFIG_MXC_SIM=y
+CONFIG_MXC_MIPI_CSI2=y
+CONFIG_MXC_HDMI_CEC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_MC13XXX=y
+CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_SNVS=y
+CONFIG_DMADEVICES=y
+CONFIG_MXC_PXP_V2=y
+CONFIG_MXC_PXP_V3=y
+CONFIG_IMX_SDMA=y
+CONFIG_MXS_DMA=y
+CONFIG_DMATEST=m
+CONFIG_STAGING=y
+CONFIG_STAGING_MEDIA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_IMX7D_ADC=y
+CONFIG_VF610_ADC=y
+CONFIG_INPUT_MPL3115=y
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_UTF8=y
+CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+CONFIG_SECURITYFS=y
+CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=y
+CONFIG_CRYPTO_RMD320=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_TWOFISH=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bb b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bb
new file mode 100644
index 0000000..71341dc
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bb
@@ -0,0 +1,18 @@
+# Copyright (C) 2016 NXP Semiconductors
+# Released under the MIT license (see COPYING.MIT for the terms)
+include recipes-kernel/linux/linux-fslc.inc
+DESCRIPTION = "Linux kernel based on linux-fsl-imx branch 4.1-1.0.x-imx from FSL Community BSP \
+with additional patches to cover devices specific on WaRP7 board."
+DEPENDS += "lzop-native bc-native"
+SRCBRANCH = "4.1-1.0.x-imx"
+SRCREV = "a543d1bd884028bed97c06ae4087e051a9176499"
+LOCALVERSION = "-${SRCBRANCH}-warp7"
+SRC_URI = "git://github.com/warp7/linux-fslc.git;branch=${SRCBRANCH} \
+           file://defconfig"
+COMPATIBLE_MACHINE = "(imx7s-warp)"
diff --git a/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend b/meta-fsl-extras/recipes/perf/perf.bbappend
index f8a9591..c4bd322 100644
--- a/meta-boot2qt-distro/recipes-kernel/perf/perf.bbappend
+++ b/meta-fsl-extras/recipes/perf/perf.bbappend
@@ -27,4 +27,5 @@
 ##
 ############################################################################
-PACKAGECONFIG_append = " libunwind"
+PERF_SRC_append_imx7s-warp = " lib"
+PERF_SRC_remove_imx7s-warp = "tools/arch"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
index 0343f06..123782e 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
@@ -1,23 +1,23 @@
-From 554d219b3485402c6992abc0aa32c74e8f251876 Mon Sep 17 00:00:00 2001
+From 07234c1c0f991a560010672a619740e385778f90 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Thu, 11 Feb 2016 10:17:51 +0200
 Subject: [PATCH] Add support for KOE tx31d200vm0baa display
 Used for the cluster demo
 ---
- arch/arm/include/asm/imx-common/fbpanel.h    | 27 +++++++++++++++++++++++++++
+ arch/arm/include/asm/imx-common/fbpanel.h    | 27 ++++++++++++++++++++
 board/boundary/nitrogen6_max/nitrogen6_max.c |  1 +
 board/boundary/nitrogen6sx/nitrogen6sx.c     |  1 +
 board/boundary/nitrogen6x/nitrogen6x.c       |  1 +
 4 files changed, 30 insertions(+)
 diff --git a/arch/arm/include/asm/imx-common/fbpanel.h b/arch/arm/include/asm/imx-common/fbpanel.h
-index b6f7af4..b8acdae 100644
+index f5465c3c80..643cd86e29 100644
 --- a/arch/arm/include/asm/imx-common/fbpanel.h
 +++ b/arch/arm/include/asm/imx-common/fbpanel.h
-@@ -39,6 +39,33 @@ void fbp_enable_fb(struct display_info_t const *di, int enable);
+@@ -116,6 +116,33 @@ void fbp_setup_display(const struct display_info_t *displays, int cnt);
- int fbp_detect_i2c(struct display_info_t const *di);
+        .fbtype = FB_##_mode,\
- void fbp_setup_display(const struct display_info_t *displays, int cnt);
+        .fbflags = _flags
 
 +/* tx31d200vm0baa == koe */
 +#define IMX_VD_KOE(_mode, _detect, _bus) \
@@ -47,44 +47,41 @@ index b6f7af4..b8acdae 100644
 +}
 +
 /* hdmi settings */
- #define IMX_VD50_1280_720M_60(_mode, _detect, _bus) \
+ #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \
 {\
 diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c
-index 337e9b5..ba29aee 100644
+index 1c4106e735..51bc0bd8f3 100644
 --- a/board/boundary/nitrogen6_max/nitrogen6_max.c
 +++ b/board/boundary/nitrogen6_max/nitrogen6_max.c
-@@ -568,6 +568,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+@@ -497,6 +497,7 @@ int fbp_detect_serializer(struct display_info_t const *di)
 }
 
 static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
        /* hdmi */
-        IMX_VD50_1280_720M_60(HDMI, 1, 1),
+        VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
-        IMX_VD50_1920_1080M_60(HDMI, 0, 1),
+        VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
 diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c
-index cdabcd8..de6582e 100644
+index dc05042add..3725d63cf3 100644
 --- a/board/boundary/nitrogen6sx/nitrogen6sx.c
 +++ b/board/boundary/nitrogen6sx/nitrogen6sx.c
-@@ -685,6 +685,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+@@ -436,6 +436,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
- 
+ }
 
 static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
-        /* hdmi/lcd */
+        /* hdmi/lcd via tfp410 */
-        _IMX_VD_1280_720M_60(LCD, 1, 2, 50, 0),
+        VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50),
-        _IMX_VD_1920_1080M_60(LCD, 0, 2, 50, 0),
+        VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50),
 diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
-index 21d6cd7..b24f2f6 100644
+index d9f6a829f1..80b102e206 100644
 --- a/board/boundary/nitrogen6x/nitrogen6x.c
 +++ b/board/boundary/nitrogen6x/nitrogen6x.c
-@@ -525,6 +525,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
+@@ -359,6 +359,7 @@ void board_pre_enable(const struct display_info_t *di)
 }
 
 static const struct display_info_t displays[] = {
 +       IMX_VD_KOE(LVDS, 0, 2),
        /* hdmi */
-        IMX_VD50_1280_720M_60(HDMI, 1, 1),
+        VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
-        IMX_VD50_1920_1080M_60(HDMI, 0, 1),
+        VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
-- 
-1.9.1
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
index 9eda199..b0791e9 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
@@ -1,4 +1,4 @@
-From 59d272d9df5337bb4bd62a96fc16c8e280c49344 Mon Sep 17 00:00:00 2001
+From fa2e83db63fe5abdfa00d205301d12e1a271a291 Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Sun, 23 Apr 2017 21:47:01 +0300
 Subject: [PATCH] set CMA reserved size to 384MB
@@ -10,12 +10,12 @@ video decoding cannot work for high resolution videos.
 1 file changed, 1 insertion(+)
 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
-index 646c505..ddbb4c5 100644
+index bd4e54cb67..48114d5739 100644
 --- a/include/configs/nitrogen6x.h
 +++ b/include/configs/nitrogen6x.h
-@@ -28,6 +28,7 @@
+@@ -33,6 +33,7 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
- #define CONFIG_VIDEO
+ 
 #define BD_I2C_MASK    7
 +#define BD_CMA         "384M"
 
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
new file mode 100644
index 0000000..c5fa923
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
@@ -0,0 +1,36 @@
+From 22c5a278b98cf6ea4e4a402bca19d1354ab3c431 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 25 Sep 2018 16:05:17 +0300
+Subject: [PATCH] Disable build for tools and use mkimage from sysroot
+fails when trying to compile with host gcc: unable to execute
+'x86_64-linux-gnu-gcc': No such file or directory
+---
+ Makefile             | 2 +-
+ scripts/Makefile.lib | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/Makefile b/Makefile
+index 119ad49eec..022690e26e 100644
+--- a/Makefile
+++ b/Makefile
+@@ -698,7 +698,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
+ 
+ libs-y := $(sort $(libs-y))
+ 
+-u-boot-dirs    := $(patsubst %/,%,$(filter %/, $(libs-y))) tools examples
+u-boot-dirs    := $(patsubst %/,%,$(filter %/, $(libs-y)))
+ 
+ u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-))))
+ 
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 80ddb08474..e86c949f08 100644
+--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
+@@ -493,5 +493,5 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
+ # ---------------------------------------------------------------------------
+ MKIMAGEOUTPUT ?= /dev/null
+ quiet_cmd_mkimage = MKIMAGE $@
+-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
+        $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT))
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend
index 013e54b..3b5235f 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,4 +31,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
        file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
        file://0002-set-CMA-reserved-size-to-384MB.patch \
+        file://0003-Disable-build-for-tools.patch \
        "
+DEPENDS += "u-boot-mkimage-native"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
index 928fb8c..fbf83da 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -1,4 +1,4 @@
-From 15ba0d8f9e2ad8f3024734810088e4caddaaec5a Mon Sep 17 00:00:00 2001
+From 2d762386376baadfe6a6447c2c19fa2d6329b985 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Fri, 9 May 2014 10:23:50 +0300
 Subject: [PATCH] Updated kernel arguments for sabre sd
@@ -9,18 +9,15 @@ Subject: [PATCH] Updated kernel arguments for sabre sd
 1 file changed, 2 insertions(+)
 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index a8746a4..251b28b 100644
+index 03d4f34904..50e84d144f 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -171,6 +171,8 @@
+@@ -111,6 +111,8 @@
                "done\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
-                "root=${mmcroot} " \
+                "root=PARTUUID=${uuid} rootwait rw " \
 +               "consoleblank=0 " \
 +               "vt.global_cursor_default=0 " \
                VIDEO_ARGS "\0" \
        "loadbootscript=" \
                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-- 
-1.9.1
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch
deleted file mode 100644
index ddd90c6..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 734ccf82db363efddb960b1c4f7db4081f2fdd7c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Thu, 18 Feb 2016 12:49:01 +0200
-Subject: [PATCH] Use hdmi as primary display only if connected
-Test if HDMI display is connected before setting it as primary display.
-Otherwise set lvds as primary display. Test can be overridden by
-setting video_interfaces env.
---
- include/configs/mx6sabre_common.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index a8746a4..485f232 100644
--- a/include/configs/mx6sabre_common.h
-+++ b/include/configs/mx6sabre_common.h
-@@ -163,8 +163,16 @@
-        "video_args_lcd=setenv video_args $video_args " \
-                "video=mxcfb${fb}:dev=lcd,CLAA-WVGA,if=RGB666\0" \
-        "fb=0\0" \
-       "video_interfaces=hdmi lvds lcd\0" \
-+       "video_interfaces=\0" \
-        "video_args_script=" \
-+        "if test -z \"${video_interfaces}\"; then " \
-+            "i2c dev 1; " \
-+            "if i2c probe 0x50; then " \
-+                  "setenv video_interfaces hdmi lvds lcd; " \
-+            "else " \
-+                  "setenv video_interfaces lvds hdmi lcd; " \
-+            "fi; " \
-+        "fi; " \
-                "for v in ${video_interfaces}; do " \
-                        "run video_args_${v}; " \
-                        "setexpr fb $fb + 1; " \
-- 
-1.9.1
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
index e8a0573..2c1c70d 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
@@ -1,4 +1,4 @@
-From ef2f2eeef6974bda0fd878c5f76b8b05ac16aa3d Mon Sep 17 00:00:00 2001
+From d9489c704107e85a0c3ba68211adbca695c88644 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 13 Sep 2017 09:40:44 +0300
 Subject: [PATCH] use imx7d-warp.dtb
@@ -8,15 +8,15 @@ Subject: [PATCH] use imx7d-warp.dtb
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/include/configs/warp7.h b/include/configs/warp7.h
-index b3e1f2e..edbd43f 100644
+index 2a7789baa2..7b44f85a87 100644
 --- a/include/configs/warp7.h
 +++ b/include/configs/warp7.h
-@@ -35,7 +35,7 @@
+@@ -39,7 +39,7 @@
        "ethact=usb_ether\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
 -       "fdt_file=imx7s-warp.dtb\0" \
 +       "fdt_file=imx7d-warp.dtb\0" \
-        "fdt_addr=0x83000000\0" \
+        "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
+        "optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \
        "boot_fdt=try\0" \
-        "ip_dyn=yes\0" \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
index b1df421..815244f 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -30,6 +30,5 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
-        file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \
        file://0001-use-imx7d-warp.dtb.patch \
        "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
index 7d8e8ec..02a1e33 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
@@ -1,4 +1,4 @@
-From 3fdf74d6934858d04d9e7df7cd24779bf7d9fdbb Mon Sep 17 00:00:00 2001
+From 3c3c3284727076f4ae751bfc9cadb222423c9a4b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 13 Jan 2016 08:55:41 +0200
 Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
@@ -8,12 +8,12 @@ Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
 1 file changed, 6 insertions(+)
 diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-index 7c11f4c..86242b5 100644
+index f6bf2f5..427d837 100644
 --- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
 +++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-@@ -105,6 +105,12 @@ else
+@@ -130,6 +130,12 @@ if itest.s "x" != "x${disable_msi}" ; then
-        setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}"
+        setenv bootargs ${bootargs} pci=nomsi
- fi
+ fi;
 
 +if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}"  ; then
 +    setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600
@@ -24,6 +24,3 @@ index 7c11f4c..86242b5 100644
 if itest.s "x" != "x${disable_giga}" ; then
        setenv bootargs ${bootargs} fec.disable_giga=1
 fi
-- 
-1.9.1
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend
index dafcf84..e4b3730 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
index 136fb80..ff25ec5 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,7 +31,7 @@ LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 DEPENDS = "u-boot-mkimage-native"
-PV = "2.7"
+PV = "2.8b3"
 SRC_URI = " \
    file://fwd_mmc.scr \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
index cf90c35..2235fae 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
@@ -1,19 +1,19 @@
-From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001
+From 7e05ac9e6dc984bd060d766740ff494e0e3519d7 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 14 Sep 2016 10:19:28 +0300
 Subject: [PATCH] Update only u-boot
 ---
- flash_blk.scr   | 4 ++--
+ flash_blk.scr | 2 +-
- flash_eth.scr   | 4 ++--
+ flash_eth.scr | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/flash_blk.scr b/flash_blk.scr
-index cc4cf38..b63366a 100644
+index 9fa6296..e599070 100644
 --- a/flash_blk.scr
 +++ b/flash_blk.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-col
+@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-c
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${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'
@@ -22,11 +22,11 @@ index cc4cf38..b63366a 100644
 if itest.b *0x30360800 -lt 0x11; then
 echo &&
 diff --git a/flash_eth.scr b/flash_eth.scr
-index 01be124..13025de 100644
+index 20244d7..7f3372c 100644
 --- a/flash_eth.scr
 +++ b/flash_eth.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board
+@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_boa
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${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'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
index 86d21fd..2aa8421 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
@@ -1,27 +1,27 @@
-From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001
+From 7d0fc874871d79125b1c17b32fec9742b2f5839e Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 14 Sep 2016 10:22:27 +0300
 Subject: [PATCH] Update only u-boot
 ---
- flash_blk.scr   | 6 +++---
+ flash_blk.scr | 4 ++--
- flash_eth.scr   | 6 +++---
+ flash_eth.scr | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/flash_blk.scr b/flash_blk.scr
-index 401c47a..8fa5af9 100644
+index ae0fd5c..1b34c75 100644
 --- a/flash_blk.scr
 +++ b/flash_blk.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage
+@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag
- setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${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 ${loadaddr} rootfs ${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'
 +setenv update_new 'run update_uboot; reset'
 
 # Upgrade part 1, write new U-Boot, but with old ECC format still...
 # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
 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...
@@ -30,24 +30,20 @@ index 401c47a..8fa5af9 100644
 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'
-+echo 'enter "run update" to update the uboot'
 diff --git a/flash_eth.scr b/flash_eth.scr
-index 15aab1c..aa98b3a 100644
+index b0e4904..0a8e3cc 100644
 --- a/flash_eth.scr
 +++ b/flash_eth.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${l
+@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write $
- setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${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 ${loadaddr} rootfs ${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'
 +setenv update_new 'run update_uboot; reset'
 
 # Upgrade part 1, write new U-Boot, but with old ECC format still...
 # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
+@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
 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...
@@ -56,7 +52,3 @@ index 15aab1c..aa98b3a 100644
 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'
-+echo 'enter "run update" to update the uboot'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
index 5c75100..12d89cf 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
@@ -17,10 +17,10 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
 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.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${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}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
+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}'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
index 16f91e8..ee91523 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
@@ -15,10 +15,10 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
 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.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${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}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
+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}'
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
index f6dc0cc..083ec6d 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
@@ -1,7 +1,7 @@
-From f86bb70bd270967082cb8132eb68c3c3dea4a7a7 Mon Sep 17 00:00:00 2001
+From 0f7d6eecead2c079ac050e6d16b64f280d9feab0 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 15 May 2017 15:31:36 +0300
-Subject: [PATCH 1/2] Make sdboot default on all boards
+Subject: [PATCH] Make sdboot default on all boards
 ... and remove console=tty1 from kernel args
 ---
@@ -12,10 +12,10 @@ Subject: [PATCH 1/2] Make sdboot default on all boards
 4 files changed, 10 insertions(+), 8 deletions(-)
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 76cbdf2..9b42af9 100644
+index 71dfeb56f5..b687dab91d 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -257,7 +257,8 @@
+@@ -256,7 +256,8 @@
 #endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
@@ -25,20 +25,20 @@ index 76cbdf2..9b42af9 100644
                "run distro_bootcmd ; " \
                "usb start ;" \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -280,7 +281,7 @@
+@@ -279,7 +280,7 @@
                " ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "setup=setenv setupargs fec_mac=${ethaddr} " \
 -               "consoleblank=0 no_console_suspend=1 console=tty1 " \
 +               "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index ab561f3..cbaeece 100644
+index f1fd5b422e..c7d75cea2a 100644
 --- a/include/configs/colibri_imx6.h
 +++ b/include/configs/colibri_imx6.h
-@@ -232,7 +232,8 @@
+@@ -231,7 +231,8 @@
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
@@ -48,17 +48,17 @@ index ab561f3..cbaeece 100644
                "run distro_bootcmd ; " \
                "usb start ;" \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -253,7 +254,7 @@
+@@ -252,7 +253,7 @@
                "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "setup=setenv setupargs fec_mac=${ethaddr} " \
 -               "consoleblank=0 no_console_suspend=1 console=tty1 " \
 +               "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index 2d6cee3..6773296 100644
+index ea04762b49..ca827a8a58 100644
 --- a/include/configs/colibri_imx7.h
 +++ b/include/configs/colibri_imx7.h
 @@ -104,7 +104,7 @@
@@ -80,7 +80,7 @@ index 2d6cee3..6773296 100644
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb && " \
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index 7fea78b..5bc3e3d 100644
+index db610d53f1..aafd4bc95e 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
 @@ -155,7 +155,7 @@
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
index 469009b..ea94c0c 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
@@ -1,8 +1,7 @@
-From 138f477c5a1990429d35ffadc8f5cea5b1e9f945 Mon Sep 17 00:00:00 2001
+From 41be67109ab0c0fd156ee8615592827624fab12e Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 19 May 2017 12:41:38 +0300
-Subject: [PATCH 2/2] apalis-imx6: test for Capacitive Touch Display 7"
+Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel
- Parallel
 Test i2c bus if Capacitive Touch Display 7" Parallel display is present
 during boot. If found, enable it as the primary display in kernel args.
@@ -14,10 +13,10 @@ support for the atmel_mxt_ts touch controller.
 1 file changed, 7 insertions(+), 2 deletions(-)
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 9b42af9..121eaa7 100644
+index b687dab91d..3351a18e4c 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -250,7 +250,7 @@
+@@ -249,7 +249,7 @@
                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
@@ -26,14 +25,14 @@ index 9b42af9..121eaa7 100644
 #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
 #else
 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
-@@ -280,9 +280,14 @@
+@@ -279,9 +279,14 @@
                "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
                " ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
 -       "setup=setenv setupargs fec_mac=${ethaddr} " \
 +       "setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \
                "consoleblank=0 no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
+                "console=${console},${baudrate}n8\0" \
 +       "setupvideo=i2c dev 0; if i2c probe 4A; " \
 +        "then setenv vidargs mxc_hdmi.only_cea=1 " \
 +               "video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
index 1bf7c27..d2e82a7 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
@@ -1,7 +1,7 @@
-From 1f3926a8e90a7e582d28b845e812d0642a4dc5ce Mon Sep 17 00:00:00 2001
+From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 12 Oct 2017 11:02:54 +0300
-Subject: [PATCH 3/3] apalis-imx6: Ixora v1.0 support
+Subject: [PATCH] apalis-imx6: Ixora v1.0 support
 Add sddrive variable that can be changed to boot from different mmc card
 slot when using different versions of ixora carrier board.
@@ -11,10 +11,10 @@ Default to drive 1, which is correct for Ixora v1.1.
 1 file changed, 5 insertions(+), 4 deletions(-)
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 121eaa7..77a8874 100644
+index 3351a18e4c..7aabb1334b 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -227,15 +227,16 @@
+@@ -226,15 +226,16 @@
                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define SD_BOOTCMD \
@@ -29,7 +29,7 @@ index 121eaa7..77a8874 100644
 -               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
 +               "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \
                "${boot_file} && run fdt_fixup && " \
-                "bootm ${kernel_addr_r} ${dtbparam}\0" \
+                "bootz ${kernel_addr_r} ${dtbparam}\0" \
 -       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 +       "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \
                "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
index c259f7f..acc5a16 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
@@ -1,22 +1,22 @@
-From 0b31b8e73bfbc02e7687ea521e9e92f892e7052a Mon Sep 17 00:00:00 2001
+From 6c83b14450862c63ebd755fdf81afde43cddfe6c Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 18 Oct 2017 13:20:25 +0300
-Subject: [PATCH 4/4] apalis-imx6: lower default resolution on HDMI to 720p
+Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p
 ---
 include/configs/apalis_imx6.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 77a8874..0292e74 100644
+index 7aabb1334b..da34817a7a 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -295,7 +295,7 @@
+@@ -294,7 +294,7 @@
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
        "vidargs=mxc_hdmi.only_cea=1 " \
 -               "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
 +               "video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
                "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
-                "fbmem=32M\0 "
+                "fbmem=32M\0"
 
diff --git a/meta-fsl-extras/wic/imx8-uboot-bootpart.wks b/meta-fsl-extras/wic/imx8-uboot-bootpart.wks
new file mode 100644
index 0000000..33de776
--- /dev/null
+++ b/meta-fsl-extras/wic/imx8-uboot-bootpart.wks
@@ -0,0 +1,19 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses u-boot
+#
+# The disk layout used is:
+#  - --------- -------------- --------------
+# | | u-boot  |     boot     |    rootfs   |
+#  - --------- -------------- --------------
+# ^ ^         ^              ^
+# | |         |              |
+# 0 33kiB    4MiB          32MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part u-boot --source rawcopy --sourceparams="file=imx-boot-sd.bin" --ondisk mmcblk --no-table --align 33
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 32
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
+bootloader --ptable msdos
diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
deleted file mode 100644
index 4454051..0000000
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ /dev/null
@@ -1,49 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-DESCRIPTION = "Extends image_dd class to boot via GRUB-EFI and initramfs."
-LICENSE = "CLOSED"
-inherit image_dd
-EXTRA_IMAGECMD_ext3 += "-L rootfs"
-do_populate_boot() {
-    GRUB_IMAGE="grub-efi-bootia32.efi"
-    DEST_IMAGE="bootia32.efi"
-    if [ "${TARGET_ARCH}" = "x86_64" ]; then
-        GRUB_IMAGE="grub-efi-bootx64.efi"
-        DEST_IMAGE="bootx64.efi"
-    fi
-    mkdir -p ${WORKDIR}/EFI/BOOT/
-    # Path where EFI firmware searches for EFI executable
-    cp ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${WORKDIR}/EFI/BOOT/${DEST_IMAGE}
-    mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
-}
diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
index 3306ada..ef83d53 100644
--- a/meta-intel-extras/conf/layer.conf
+++ b/meta-intel-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_intel"
 BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_intel = "20"
+LAYERSERIES_COMPAT_b2qt_intel = "sumo"
diff --git a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
deleted file mode 100644
index 287cf7c..0000000
--- a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by meta-b2qt
-serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
-default=boot
-timeout=0
-menuentry 'boot' {
-    linux /boot/bzImage root=LABEL=rootfs
-    initrd /boot/initramfs
-}
diff --git a/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend b/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend
new file mode 100644
index 0000000..c1918ba
--- /dev/null
+++ b/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+INITRAMFS_SCRIPTS += "initramfs-module-rtsx-pci-sdmmc"
+PACKAGE_INSTALL += "kernel-module-rtsx-pci-sdmmc"
diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh b/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh
deleted file mode 100644
index 09eadbf..0000000
--- a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-modprobe rtsx_pci_sdmmc
diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc b/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc
new file mode 100644
index 0000000..dd14d6d
--- /dev/null
+++ b/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc
@@ -0,0 +1,8 @@
+#!/bin/sh
+rtsx_pci_sdmmc_enabled() {
+    return 0
+}
+rtsx_pci_sdmmc_run() {
+    load_kernel_module rtsx_pci_sdmmc
+}
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend b/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend
index 3cfe234..cfd05cd 100644
--- a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,12 +29,14 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-FILES_${PN} += "etc/connman/main.conf"
+SRC_URI += "file://rtsx_pci_sdmmc"
-SRC_URI += "file://main.conf \
-          "
 do_install_append() {
-    install -d ${D}${sysconfdir}/connman
+    install -m 0755 ${WORKDIR}/rtsx_pci_sdmmc ${D}/init.d/20-rtsx_pci_sdmmc
-    install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman/main.conf
 }
+PACKAGES += "initramfs-module-rtsx-pci-sdmmc"
+SUMMARY_initramfs-module-rtsx-pci-sdmmc = "initramfs support for rtsx_pci_sdmmc"
+RDEPENDS_initramfs-module-rtsx-pci-sdmmc = "${PN}-base"
+FILES_initramfs-module-rtsx-pci-sdmmc = "/init.d/20-rtsx_pci_sdmmc"
diff --git a/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
new file mode 100644
index 0000000..a50d2a2
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
@@ -0,0 +1,39 @@
+From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 15 Nov 2016 15:20:49 +0200
+Subject: [PATCH 1/6] Simplify wayland-scanner lookup
+Organization: O.S. Systems Software LTDA.
+Don't use pkg-config to lookup the path of a binary that's in the path.
+Alternatively we'd have to prefix the path returned by pkg-config with
+PKG_CONFIG_SYSROOT_DIR.
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.ac | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index 14f1af2b2f..916d0bd207 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1825,12 +1825,7 @@ for plat in $platforms; do
+         PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
+         WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
+ 
+-        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+-                          WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+-                          WAYLAND_SCANNER='')
+-        if test "x$WAYLAND_SCANNER" = x; then
+-            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+-        fi
+        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+ 
+         if test "x$WAYLAND_SCANNER" = "x:"; then
+                 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
deleted file mode 100644
index e49695b..0000000
--- a/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH] Simplify wayland-scanner lookup
-Don't use pkg-config to lookup the path of a binary that's in the path.
-Alternatively we'd have to prefix the path returned by pkg-config with
-PKG_CONFIG_SYSROOT_DIR.
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- configure.ac | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index e56e35a..a92005a 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
-     AC_MSG_ERROR([cannot build egl state tracker without EGL library])
- fi
- 
-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
-        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
-        WAYLAND_SCANNER='')
-if test "x$WAYLAND_SCANNER" = x; then
-    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
-fi
-+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
- 
- # Do per-EGL platform setups and checks
- egl_platforms=`IFS=', '; echo $with_egl_platforms`
-- 
-2.1.4
diff --git a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
new file mode 100644
index 0000000..ffb3bf7
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
@@ -0,0 +1,34 @@
+From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 16 Aug 2017 18:58:20 -0700
+Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h
+Organization: O.S. Systems Software LTDA.
+vmw_screen.h uses dev_t which is defines in sys/types.h
+this header is required to be included for getting dev_t
+definition. This issue happens on musl C library, it is hidden
+on glibc since sys/types.h is included through another
+system headers
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864]
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
+index f21cabb51f..4c972fdaa9 100644
+--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
+@@ -41,6 +41,7 @@
+ #include "svga_winsys.h"
+ #include "pipebuffer/pb_buffer_fenced.h"
+ #include <os/os_thread.h>
+#include <sys/types.h>
+ 
+ #define VMW_GMR_POOL_SIZE (16*1024*1024)
+ #define VMW_QUERY_POOL_SIZE (8192)
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
new file mode 100644
index 0000000..5e735ca
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
@@ -0,0 +1,44 @@
+From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 5 Jun 2018 11:11:10 -0300
+Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases
+Organization: O.S. Systems Software LTDA.
+$ llvm-config-host --version
+5.0.0git-9a5c333388c
+We need to ignore everything after 5.0.0 which is what the cut cmd is
+doing
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index 916d0bd207..dd172f1ebe 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() {
+ 
+ llvm_set_environment_variables() {
+     if test "x$LLVM_CONFIG" != xno; then
+-        LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
+        LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
+         LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
+         LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
+         LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
+@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() {
+     dnl ourselves.
+     dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
+     dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
+-    LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+    LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
+     AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
+ 
+     if test "x$llvm_have_one_so" = xyes; then
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
new file mode 100644
index 0000000..8953c4a
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
@@ -0,0 +1,32 @@
+From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Fri, 29 Dec 2017 10:27:59 -0200
+Subject: [PATCH 4/6] Use Python 3 to execute the scripts
+Organization: O.S. Systems Software LTDA.
+The MESA build system uses Python 2 but as OE-Core has moved away from
+it, we change it to use Python 3 instead.
+Upstream-Status: Inappropriate [ configuration ]
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/configure.ac b/configure.ac
+index dd172f1ebe..40cac36ac2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
+ AC_PROG_NM
+ AM_PROG_AS
+ AX_CHECK_GNU_MAKE
+-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python])
+ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
new file mode 100644
index 0000000..d40e7b5
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
@@ -0,0 +1,36 @@
+From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 6 Jun 2018 09:50:35 -0300
+Subject: [PATCH 5/6] dri: i965: Add missing time.h include
+Organization: O.S. Systems Software LTDA.
+This fixes a build error when using musl:
+,----
+| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0:
+| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t'
+|     time_t free_time;
+|     ^~~~~~
+`----
+Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
+index 68f5e0c2c8..5b60a23763 100644
+--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
+@@ -37,6 +37,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+#include <time.h>
+ #include "util/u_atomic.h"
+ #include "util/list.h"
+ 
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
new file mode 100644
index 0000000..0212922
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
@@ -0,0 +1,37 @@
+From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Wed, 29 Aug 2018 22:10:30 -0300
+Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+Organization: O.S. Systems Software LTDA.
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+pkgconfig would return an absolute path in
+/usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/configure.ac b/configure.ac
+index 40cac36ac2..728bbdcbc4 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1823,7 +1823,7 @@ for plat in $platforms; do
+         PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
+         PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
+         PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
+-        WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
+        PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
+ 
+         AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+ 
+-- 
+2.18.0
diff --git a/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch
deleted file mode 100644
index d2d6755..0000000
--- a/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Configure checks for compiler to be gcc and then it enables asm_offsets
-generation. see
-https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d
-However, we missed the check when enabling this on cross compilation
-when architecture for both host and target is x86
-Fixes errors like
-./gen_matypes > matypes.h
-/bin/bash: ./gen_matypes: No such file or directory
-Khem
-Upstream-Status: Submitted
-Index: mesa-12.0.1/configure.ac
-===================================================================
--- mesa-12.0.1.orig/configure.ac
-+++ mesa-12.0.1/configure.ac
-@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU
- if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
-     case "$host_cpu" in
-     i?86 | x86_64 | amd64)
-        if test "x$host_cpu" != "x$target_cpu"; then
-+        if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then
-             enable_asm=no
-             AC_MSG_RESULT([no, cross compiling])
-         fi
diff --git a/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch b/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch
deleted file mode 100644
index 0280ee8..0000000
--- a/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-endianness check is OS wide and not specific to libc
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- src/util/u_endian.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/util/u_endian.h b/src/util/u_endian.h
-index b9d563d..2d5eab9 100644
--- a/src/util/u_endian.h
-+++ b/src/util/u_endian.h
-@@ -27,7 +27,7 @@
- #ifndef U_ENDIAN_H
- #define U_ENDIAN_H
- 
-#if defined(__GLIBC__) || defined(ANDROID)
-+#if defined(__linux__)
- #include <endian.h>
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
-- 
-2.1.4
diff --git a/meta-intel-extras/recipes/mesa/mesa.inc b/meta-intel-extras/recipes/mesa/mesa.inc
new file mode 100644
index 0000000..0219ded
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/mesa.inc
@@ -0,0 +1,233 @@
+SUMMARY = "A free implementation of the OpenGL API"
+DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
+a system for rendering interactive 3D graphics.  \
+A variety of device drivers allows Mesa to be used in many different environments \
+ranging from software emulation to complete hardware acceleration for modern GPUs. \
+Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
+environment."
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"
+PE = "2"
+DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native"
+EXTRANATIVEPATH += "chrpath-native"
+PROVIDES = " \
+    ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
+    virtual/mesa \
+    "
+inherit autotools pkgconfig python3native gettext distro_features_check
+ANY_OF_DISTRO_FEATURES = "opengl vulkan"
+PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
+               ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
+               surfaceless"
+export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
+export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
+EXTRA_OECONF = "--enable-shared-glapi \
+                --disable-opencl \
+                --enable-glx-read-only-text \
+                PYTHON2=python2 \
+                --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \
+                --with-platforms='${PLATFORMS}'"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
+                   "
+# "gbm" requires "dri", "opengl"
+PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+# "x11" requires "opengl"
+PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
+PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
+PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
+DRIDRIVERS = "swrast"
+DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
+DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
+# "dri" requires "opengl"
+PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
+PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
+# Vulkan drivers need dri3 enabled
+# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9
+VULKAN_DRIVERS = ""
+VULKAN_DRIVERS_append_x86 = ",intel"
+VULKAN_DRIVERS_append_x86-64 = ",intel"
+PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native"
+PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl"
+# "gles" requires "opengl"
+PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
+# "egl" requires "dri", "opengl"
+PACKAGECONFIG[egl] = "--enable-egl, --disable-egl"
+PACKAGECONFIG[etnaviv] = ""
+PACKAGECONFIG[imx] = ""
+GALLIUMDRIVERS = "swrast"
+GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
+GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}"
+GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
+PACKAGECONFIG[r600] = ""
+GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
+GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
+GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
+GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
+GALLIUMDRIVERS_append_qemux86 = ",virgl"
+GALLIUMDRIVERS_append_qemux86-64 = ",virgl"
+# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
+PACKAGECONFIG[gallium]      = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
+MESA_LLVM_RELEASE ?= "6.0"
+PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
+                               ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
+export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
+PACKAGECONFIG[xa]  = "--enable-xa, --disable-xa"
+OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}"
+PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}"
+PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
+EXTRA_OECONF_remove_libc-musl = "--enable-glx-tls"
+EXTRA_OECONF_append_libc-musl = " --disable-glx-tls"
+EXTRA_OECONF_append_libc-musl_x86 = " --disable-asm"
+# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
+FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
+CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
+EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+# Remove the mesa dependency on mesa-dev, as mesa is empty
+RDEPENDS_${PN}-dev = ""
+# Add dependency so that GLES3 header don't need to be added manually
+RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
+PACKAGES =+ "libegl-mesa libegl-mesa-dev \
+             libosmesa libosmesa-dev \
+             libgl-mesa libgl-mesa-dev \
+             libglapi libglapi-dev \
+             libgbm libgbm-dev \
+             libgles1-mesa libgles1-mesa-dev \
+             libgles2-mesa libgles2-mesa-dev \
+             libgles3-mesa libgles3-mesa-dev \
+             libwayland-egl libwayland-egl-dev \
+             libxatracker libxatracker-dev \
+             mesa-megadriver mesa-vulkan-drivers \
+            "
+do_install_append () {
+    # Drivers never need libtool .la files
+    rm -f ${D}${libdir}/dri/*.la
+    rm -f ${D}${libdir}/egl/*.la
+    rm -f ${D}${libdir}/gallium-pipe/*.la
+    rm -f ${D}${libdir}/gbm/*.la
+    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
+    rm -f ${D}${sysconfdir}/drirc
+    chrpath --delete ${D}${libdir}/dri/*_dri.so || true
+}
+# For the packages that make up the OpenGL interfaces, inject variables so that
+# they don't get Debian-renamed (which would remove the -mesa suffix), and
+# RPROVIDEs/RCONFLICTs on the generic libgl name.
+python __anonymous() {
+    pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
+    for p in (("egl", "libegl", "libegl1"),
+              ("dri", "libgl", "libgl1"),
+              ("gles", "libgles1", "libglesv1-cm1"),
+              ("gles", "libgles2", "libglesv2-2"),
+              ("gles", "libgles3",)):
+        if not p[0] in pkgconfig:
+            continue
+        fullp = p[1] + "-mesa"
+        pkgs = " ".join(p[1:])
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+        d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver")
+        # For -dev, the first element is both the Debian and original name
+        fullp += "-dev"
+        pkgs = p[1] + "-dev"
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+}
+python mesa_populate_packages() {
+    pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
+    for pkg in pkgs:
+        d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+        d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+        d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
+    import re
+    dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
+    if os.path.isdir(dri_drivers_root):
+        dri_pkgs = os.listdir(dri_drivers_root)
+        lib_name = d.expand("${MLPREFIX}mesa-megadriver")
+        for p in dri_pkgs:
+            m = re.match('^(.*)_dri\.so$', p)
+            if m:
+                pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
+                d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
+                d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
+                d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
+    pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
+    do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
+}
+PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
+PACKAGES_DYNAMIC += "^mesa-driver-.*"
+FILES_${PN} += "${sysconfdir}/drirc"
+FILES_mesa-megadriver = "${libdir}/dri/*"
+FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
+FILES_libegl-mesa = "${libdir}/libEGL.so.*"
+FILES_libgbm = "${libdir}/libgbm.so.*"
+FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
+FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
+FILES_libgl-mesa = "${libdir}/libGL.so.*"
+FILES_libglapi = "${libdir}/libglapi.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
+FILES_libxatracker = "${libdir}/libxatracker.so.*"
+FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
+FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
+FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
+FILES_libglapi-dev = "${libdir}/libglapi.*"
+FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
+FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
+FILES_libgles3-mesa-dev = "${includedir}/GLES3"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
+FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
+FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
+                          ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
+                          ${libdir}/pkgconfig/xatracker.pc"
diff --git a/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb b/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb
deleted file mode 100644
index b95f301..0000000
--- a/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require recipes-graphics/mesa/${BPN}.inc
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
-           file://replace_glibc_check_with_linux.patch \
-           file://disable-asm-on-non-gcc.patch \
-           file://0001-Use-wayland-scanner-in-the-path.patch \
-"
-SRC_URI[md5sum] = "8f808e92b893d412fbd6510e1d16f5c5"
-SRC_URI[sha256sum] = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4"
-#because we cannot rely on the fact that all apps will use pkgconfig,
-#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-do_install_append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
-        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
-    fi
-}
diff --git a/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb b/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb
new file mode 100644
index 0000000..86d6a6b
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb
@@ -0,0 +1,21 @@
+require ${BPN}.inc
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+           file://0001-Simplify-wayland-scanner-lookup.patch \
+           file://0002-winsys-svga-drm-Include-sys-types.h.patch \
+           file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
+           file://0004-Use-Python-3-to-execute-the-scripts.patch \
+           file://0005-dri-i965-Add-missing-time.h-include.patch \
+           file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
+"
+SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a"
+SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83"
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+    fi
+}
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb
index f3a95f2..8682c27 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,33 +27,26 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SUMMARY = "Initramfs with early load intel microcode"
-SRC_URI += "file://grub.cfg"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-do_install[depends] += " \
+inherit deploy nopackages
-    virtual/kernel:do_deploy \
+do_compile[depends] += " \
    ${INITRAMFS_IMAGE}:do_image_complete \
    ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
-"
+    "
-do_deploy_prepend() {
-cat > ${WORKDIR}/cfg <<EOF
+do_compile() {
-search.file /boot/grub2/grub.cfg root
+    # https://www.kernel.org/doc/Documentation/x86/microcode.txt
-set prefix=/boot/grub2
+    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
-EOF
+    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${S}/microcode-initramfs
 }
-do_install_append() {
+do_deploy() {
+    install -d ${DEPLOYDIR}
-    install -d ${D}/boot/grub2/
+    install -m 0644 ${S}/microcode-initramfs ${DEPLOYDIR}/
-    install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
-    # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
-    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
-    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs
-    chmod 0644 ${D}/boot/initramfs
 }
-PACKAGES += "${PN}-config"
+addtask deploy before do_build after do_compile
-FILES_${PN}-config = "/boot/grub2/ /boot/initramfs"
diff --git a/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks b/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks
new file mode 100644
index 0000000..4907631
--- /dev/null
+++ b/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks
@@ -0,0 +1,13 @@
+# short-description: Create an EFI disk image with systemd-boot
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media. The selected bootloader is systemd-boot.
+# It also includes intel-microcode as an initrd for early update support.
+# Based on OE-core's systemd-bootdisk.wks file.
+part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode-initramfs" --ondisk sda --label msdos --active --align 1024 --use-uuid
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
+bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"
diff --git a/meta-nvidia-extras/conf/layer.conf b/meta-nvidia-extras/conf/layer.conf
index f1717ac..fb31624 100644
--- a/meta-nvidia-extras/conf/layer.conf
+++ b/meta-nvidia-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_nvidia"
 BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_nvidia = "20"
+LAYERSERIES_COMPAT_b2qt_nvidia = "sumo"
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
deleted file mode 100644
index a1e45b9..0000000
--- a/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[General]
-PreferredTechnologies=ethernet,wifi,cellular
-NetworkInterfaceBlacklist=eth0
diff --git a/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
deleted file mode 100644
index 4314a20..0000000
--- a/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-PROVIDES = "virtual/egl virtual/libgles2"
-RPROVIDES_${PN} = "libegl libegl-dev libgles2 libgles2-dev"
-RCONFLICTS_${PN} = "libegl-mesa libegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
-RREPLACES_${PN} = "libegl-mesa lbegl-mesa-dev libgles2-mesa libgles2-mesa-dev"
diff --git a/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
deleted file mode 100644
index d3e2337..0000000
--- a/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append)
-FILESEXTRAPATHS_tegra-x1_prepend = "__default:"
-FILESEXTRAPATHS_tegra-t18x_prepend = "__default:"
-# ERROR: QA Issue: Files/directories were installed but not shipped in any package
-FILES_${PN}-gk20a = "${FILES__${PN}-gk20a}"
diff --git a/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
deleted file mode 100644
index df91dfe..0000000
--- a/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-ALLOW_EMPTY_${PN} = "1"
diff --git a/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend
index 33bcc34..46e3bbb 100644
--- a/meta-boot2qt-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
+++ b/meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-LICENSE_CREATE_PACKAGE = "0"
+RDEPENDS_${PN} += "tegra-drivers"
diff --git a/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
index c7730c6..9fa1a9c 100644
--- a/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
+++ b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
@@ -16,11 +16,11 @@
 KERN_DIR := "${LNX_TOPDIR}_src/kernel"
 # Kernel source is the kernel tarball in PDK
 SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
-PV = "4.4"
+PV = "4.9"
 # Extracting linux.tar.bz2 creates directories
-# <top>/vibrante-oss-src/kernel
+# <top>/drive-oss-src/kernel
-S = "${WORKDIR}/vibrante-oss-src/kernel"
+S = "${WORKDIR}/drive-oss-src/kernel"
 # Need to pass this to for oe_runmake explicitly for building outside kerneldir
 EXTRA_OEMAKE += " -C ${S} O=${B}"
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
index 835dfe8..a2103ba 100644
--- a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,14 +28,11 @@
 ############################################################################
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += "file://0001-Fix-misleading-indentation-error.patch;patchdir=.."
+SRC_URI += "file://0001-Disable-more-warnings.patch"
 CROSS_COMPILE_PREFIX = "${CROSS_COMPILE}"
-PACKAGES += "kernel-devicetree"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree"
-FILES_kernel-devicetree = "/boot/*.dtb"
-RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
 python do_patch () {
    bb.build.exec_func('patch_do_patch', d)
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch
new file mode 100644
index 0000000..d881d57
--- /dev/null
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch
@@ -0,0 +1,27 @@
+From d863ce14300576c53492713140eb0dfacba1d8ab Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Fri, 28 Sep 2018 13:30:56 +0300
+Subject: [PATCH] Disable more warnings
+Current compiler options are more strict than the old kernel is
+prepared. Disable those warnings.
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+diff --git a/Makefile b/Makefile
+index 43a6127..d3e40f3 100644
+--- a/Makefile
+++ b/Makefile
+@@ -627,6 +627,11 @@ ARCH_AFLAGS :=
+ ARCH_CFLAGS :=
+ include arch/$(SRCARCH)/Makefile
+ 
+KBUILD_CFLAGS  += $(call cc-disable-warning,format-overflow,)
+KBUILD_CFLAGS  += $(call cc-disable-warning,format-truncation,)
+KBUILD_CFLAGS  += $(call cc-disable-warning,int-in-bool-context,)
+KBUILD_CFLAGS  += $(call cc-disable-warning,misleading-indentation,)
+KBUILD_CFLAGS  += $(call cc-disable-warning,tautological-compare,)
+ KBUILD_CFLAGS  += $(call cc-option,-fno-delete-null-pointer-checks,)
+ KBUILD_CFLAGS  += $(call cc-disable-warning,frame-address,)
+ 
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch
deleted file mode 100644
index a344adc..0000000
--- a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 33d112e943590020f2cda2a403a755531833b016 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 31 Mar 2017 09:42:18 +0300
-Subject: [PATCH] Fix misleading-indentation error
-error: this 'if' clause does not guard... [-Werror=misleading-indentation]
-   if (!runlist->active_channels)
---
- nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-diff --git a/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
-index 3e57c67..e2fe4db 100644
--- a/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
-+++ b/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
-@@ -209,15 +209,15 @@ static int init_runlist(struct gk20a *g, struct fifo_gk20a *f)
-                if (!runlist->active_channels)
-                        goto clean_up_runlist;
- 
-                       runlist_size  = sizeof(u16) * f->num_channels;
-                       for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) {
-                               int err = gk20a_gmmu_alloc_sys(g, runlist_size,
-                                               &runlist->mem[i]);
-                               if (err) {
-                                       dev_err(d, "memory allocation failed\n");
-                                       goto clean_up_runlist;
-                               }
-+               runlist_size  = sizeof(u16) * f->num_channels;
-+               for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) {
-+                       int err = gk20a_gmmu_alloc_sys(g, runlist_size,
-+                                       &runlist->mem[i]);
-+                       if (err) {
-+                               dev_err(d, "memory allocation failed\n");
-+                               goto clean_up_runlist;
-                        }
-+               }
-                mutex_init(&runlist->mutex);
- 
-                /* None of buffers is pinned if this value doesn't change.
-- 
-2.7.4
diff --git a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
deleted file mode 100644
index 94178db..0000000
--- a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"
-COMPATIBLE_MACHINE_aarch64 = "(.*)"
diff --git a/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend
index 7c2f7b5..c9081a5 100644
--- a/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend
+++ b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,3 +28,4 @@
 ############################################################################
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS_${PN} += "bash"
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
deleted file mode 100644
index da1f5f7..0000000
--- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: egl
-Description: Mesa EGL library
-Requires.private:  libdrm >= 2.4.24   
-Version: 9.1.6
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} 
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
index 2cc22df..7e23d32 100644
--- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,11 +27,6 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " file://egl.pc"
-FILES_${PN} += "egl.pc"
 GRAPHICS_PACKAGES = " \
    virtual/libgles2 \
    virtual/libegl \
@@ -42,8 +37,5 @@ GRAPHICS_PACKAGES = " \
    libgbm \
    libgbm-dev \
    "
+RDEPENDS_${PN}-nvidia-egl-wayland += "wayland"
-do_install_append_tegra-t18x() {
+INSANE_SKIP_${PN}-gst += "file-rdeps"
-    install -d ${D}/usr/lib/pkgconfig
-    install -m 0775 ${WORKDIR}/egl.pc ${D}/${libdir}/pkgconfig
-}
diff --git a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
index f05607c..209cc19 100644
--- a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
+++ b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,8 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := ":${LNX_TOPDIR}_src/wayland"
-SRC_URI = "file://wayland-1.11.0-src.tar.gz"
 DEPENDS_append_class-target = " wayland-egl"
diff --git a/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch b/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch
new file mode 100644
index 0000000..b7230cb
--- /dev/null
+++ b/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index 691878f..0564bb2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -174,10 +174,10 @@ AC_ARG_ENABLE(drm-compositor, [  --enable-drm-compositor],,
+ AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test x$enable_drm_compositor = xyes)
+ if test x$enable_drm_compositor = xyes; then
+   AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor])
+-  PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0])
+-  PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2],
+-                   [AC_DEFINE([HAVE_GBM_FD_IMPORT], 1, [gbm supports dmabuf import])],
+-                   [AC_MSG_WARN([gbm does not support dmabuf import, will omit that capability])])
+  PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm mtdev >= 1.1.0])
+  #PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2],
+                   #[AC_DEFINE([HAVE_GBM_FD_IMPORT], 1, [gbm supports dmabuf import])],
+                   #[AC_MSG_WARN([gbm does not support dmabuf import, will omit that capability])])
+ fi
+ 
+ AC_ARG_ENABLE(eglstream-compositor, [  --enable-eglstream-compositor],,
+@@ -190,8 +190,8 @@ fi
+ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
+ PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
+ 
+-PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
+-                 [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
+#PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
+#                [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
+ 
+ AC_ARG_ENABLE(wayland-compositor, [  --enable-wayland-compositor],,
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
deleted file mode 100644
index 5f4d79c..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Wed, 11 May 2016 16:16:30 +0300
-Subject: [PATCH] configure.ac: Fix wayland-protocols path
-The wayland-protocols directory is used during build: Fix the path
-to point to sysroot specified in recipe.
-Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
-breaks multilib weston as it would point to multilib sysroot when the
-(allarch) wayland-protocols is actually in the machine sysroot.
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Inappropriate [embedded specific]
---
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/configure.ac
-+++ b/configure.ac
-@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
- PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
- 
- PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
-                 [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
-+                 [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
- 
- AC_ARG_ENABLE(wayland-compositor, [  --enable-wayland-compositor],,
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch b/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch
deleted file mode 100644
index 148848d..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH weston] make error() portable
-error() is not posix but gnu extension so may not be available on all
-kind of systemsi e.g. musl.
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Submitted
- configure.ac        |  2 ++
- src/weston-error.h  | 20 ++++++++++++++++++++
- src/weston-launch.c |  2 +-
- 3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 src/weston-error.h
-diff --git a/configure.ac b/configure.ac
-index 263fc22..f52cd62 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
-              [[#include <time.h>]])
- AC_CHECK_HEADERS([execinfo.h])
- 
-+AC_CHECK_HEADERS([error.h])
-+
- AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
- 
- COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2"
-diff --git a/src/weston-error.h b/src/weston-error.h
-new file mode 100644
-index 0000000..2089d02
--- /dev/null
-+++ b/src/weston-error.h
-@@ -0,0 +1,20 @@
-+#ifndef _WESTON_ERROR_H
-+#define _WESTON_ERROR_H
-+
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#include <string.h>
-+#define _weston_error(S, E, F, ...) do { \
-+       if (E) \
-+               err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+       else \
-+               err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _weston_error
-+#endif
-+
-+#endif
-+
-diff --git a/src/weston-launch.c b/src/weston-launch.c
-index 10c66de..3e6d30a 100644
--- a/src/weston-launch.c
-+++ b/src/weston-launch.c
-@@ -30,7 +30,6 @@
- #include <poll.h>
- #include <errno.h>
- 
-#include <error.h>
- #include <getopt.h>
- 
- #include <sys/types.h>
-@@ -56,6 +55,7 @@
- #endif
- 
- #include "weston-launch.h"
-+#include "weston-error.h"
- 
- #define DRM_MAJOR 226
- 
-- 
-2.1.4
diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
deleted file mode 100644
index 70b9888..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
-weston-launch requires PAM for starting weston as a non-root user.
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-Upstream-Status: Pending
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- configure.ac              |  9 +++++++--
- libweston/weston-launch.c | 20 ++++++++++++++++++++
- 2 files changed, 27 insertions(+), 2 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 46cb2c7..bb45f46 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
-       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
- 
-+AC_ARG_WITH(pam,
-+            AS_HELP_STRING([--with-pam], [Use PAM]),
-+            [use_pam=$withval], [use_pam=yes])
- AC_ARG_ENABLE(weston-launch, [  --enable-weston-launch],, enable_weston_launch=yes)
- AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
-if test x$enable_weston_launch = xyes; then
-+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
-   WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
-   if test x$have_pam = xno; then
-    AC_ERROR([weston-launch requires pam])
-+    AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
-   fi
-+  AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
- fi
- 
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -701,6 +705,7 @@ AC_MSG_RESULT([
-        Enable developer documentation  ${enable_devdocs}
- 
-        weston-launch utility           ${enable_weston_launch}
-+       PAM support                     ${use_pam}
-        systemd-login support           ${have_systemd_login}
-        systemd notify support          ${enable_systemd_notify}
- 
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 0491896..07e7469 100644
--- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd)
- #endif
- 
- struct weston_launch {
-+#ifdef HAVE_PAM
-        struct pam_conv pc;
-        pam_handle_t *ph;
-+#endif
-        int tty;
-        int ttynr;
-        int sock[2];
-@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl)
-        return false;
- }
- 
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
-                    const struct pam_message **messages,
-@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl)
- 
-        return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status)
-        close(wl->signalfd);
-        close(wl->sock[0]);
- 
-+#ifdef HAVE_PAM
-        if (wl->new_user) {
-                err = pam_close_session(wl->ph, 0);
-                if (err)
-@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status)
-                                err, pam_strerror(wl->ph, err));
-                pam_end(wl->ph, err);
-        }
-+#endif
- 
-        if (ioctl(wl->tty, KDSKBMUTE, 0) &&
-            ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
-        setenv("HOME", wl->pw->pw_dir, 1);
-        setenv("SHELL", wl->pw->pw_shell, 1);
- 
-+#ifdef HAVE_PAM
-        env = pam_getenvlist(wl->ph);
-        if (env) {
-                for (i = 0; env[i]; ++i) {
-@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
-                }
-                free(env);
-        }
-+#endif
- 
-        /*
-         * We open a new session, so it makes sense
-@@ -675,7 +685,9 @@ static void
- help(const char *name)
- {
-        fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
-        fprintf(stderr, "  -u, --user      Start session as specified username\n");
-+#endif
-        fprintf(stderr, "  -t, --tty       Start session on alternative tty\n");
-        fprintf(stderr, "  -v, --verbose   Be verbose\n");
-        fprintf(stderr, "  -h, --help      Display this help message\n");
-@@ -688,7 +700,9 @@ main(int argc, char *argv[])
-        int i, c;
-        char *tty = NULL;
-        struct option opts[] = {
-+#ifdef HAVE_PAM
-                { "user",    required_argument, NULL, 'u' },
-+#endif
-                { "tty",     required_argument, NULL, 't' },
-                { "verbose", no_argument,       NULL, 'v' },
-                { "help",    no_argument,       NULL, 'h' },
-@@ -700,9 +714,13 @@ main(int argc, char *argv[])
-        while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
-                switch (c) {
-                case 'u':
-+#ifdef HAVE_PAM
-                        wl.new_user = optarg;
-                        if (getuid() != 0)
-                                error(1, 0, "Permission denied. -u allowed for root only");
-+#else
-+                       error(1, 0, "-u is unsupported in this weston-launch build");
-+#endif
-                        break;
-                case 't':
-                        tty = optarg;
-@@ -740,8 +758,10 @@ main(int argc, char *argv[])
-        if (setup_tty(&wl, tty) < 0)
-                exit(EXIT_FAILURE);
- 
-+#ifdef HAVE_PAM
-        if (wl.new_user && setup_pam(&wl) < 0)
-                exit(EXIT_FAILURE);
-+#endif
- 
-        if (setup_launcher_socket(&wl) < 0)
-                exit(EXIT_FAILURE);
-- 
-2.1.4
diff --git a/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch b/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch
deleted file mode 100644
index 93376ef..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 6c89292024cc08d4499916dc153c354175bd81c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
-Date: Fri, 21 Oct 2016 14:03:13 -0500
-Subject: [PATCH] Add configuration option for no input device.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-[Backported from master, 75b7197.)
-As it has been discussed in the past [1], running Weston
-without any input device at launch might be beneficial for
-some use cases.
-Certainly, it's best for the vast majority of users (and
-the project) to require an input device to be present, as
-to avoid frustration and hassle, but for those brave souls
-that so prefer, this patch lets them run without any input
-device at all.
-This introduces a simple configuration in weston.ini:
-  [core]
-  require-input=true
-True is the default, so no behavioral change is introduced.
-[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html
-Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Daniel Stone <daniels@collabora.com>
---
- man/weston.ini.man  | 5 +++++
- src/compositor.h    | 4 ++++
- src/libinput-seat.c | 6 ++++++
- src/main.c          | 5 +++++
- weston.ini.in       | 1 +
- 5 files changed, 21 insertions(+)
-diff --git a/man/weston.ini.man b/man/weston.ini.man
-index a9b6026..668b16f 100644
--- a/man/weston.ini.man
-+++ b/man/weston.ini.man
-@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other
- hand, if none of these sets the value, default idle timeout will be
- set to 300 seconds.
- .RS
-+.PP
-+.RE
-+.TP 7
-+.BI "require-input=" true
-+require an input device for launch
- 
- .SH "LIBINPUT SECTION"
- The
-diff --git a/src/compositor.h b/src/compositor.h
-index c4c81f0..292a412 100644
--- a/src/compositor.h
-+++ b/src/compositor.h
-@@ -701,6 +701,10 @@ struct weston_compositor {
- 
-        void *user_data;
-        void (*exit)(struct weston_compositor *c);
-+
-+       /* Whether to let the compositor run without any input device. */
-+       bool require_input;
-+
- };
- 
- struct weston_buffer {
-diff --git a/src/libinput-seat.c b/src/libinput-seat.c
-index c9f9ed2..1c4c358 100644
--- a/src/libinput-seat.c
-+++ b/src/libinput-seat.c
-@@ -250,6 +250,12 @@ udev_input_enable(struct udev_input *input)
-                        devices_found = 1;
-        }
- 
-+       if (devices_found == 0 && !c->require_input) {
-+               weston_log("warning: no input devices found, but none required "
-+                          "as per configuration.\n");
-+               return 0;
-+       }
-+
-        if (devices_found == 0) {
-                weston_log(
-                        "warning: no input devices on entering Weston. "
-diff --git a/src/main.c b/src/main.c
-index a98570e..b8632e9 100644
--- a/src/main.c
-+++ b/src/main.c
-@@ -658,6 +658,7 @@ int main(int argc, char *argv[])
-        struct wl_client *primary_client;
-        struct wl_listener primary_client_destroyed;
-        struct weston_seat *seat;
-+       int require_input;
- 
-        const struct weston_option core_options[] = {
-                { WESTON_OPTION_STRING, "backend", 'B', &backend },
-@@ -737,6 +738,10 @@ int main(int argc, char *argv[])
-        if (weston_compositor_init_config(ec, config) < 0)
-                goto out_signals;
- 
-+       weston_config_section_get_bool(section, "require-input",
-+                                      &require_input, true);
-+       ec->require_input = require_input;
-+
-        if (backend_init(ec, &argc, argv, config) < 0) {
-                weston_log("fatal: failed to create compositor backend\n");
-                goto out_signals;
-diff --git a/weston.ini.in b/weston.ini.in
-index 06b51df..e9ef992 100644
--- a/weston.ini.in
-+++ b/weston.ini.in
-@@ -2,6 +2,7 @@
- #modules=xwayland.so,cms-colord.so
- #shell=desktop-shell.so
- #gbm-format=xrgb2101010
-+#require-input=true
- 
- [shell]
- background-image=/usr/share/backgrounds/gnome/Aqua.jpg
-- 
-1.9.1
diff --git a/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch b/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch
deleted file mode 100644
index a40eaf1..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001
-From: Frederico Cadete <frederico@cadete.eu>
-Date: Mon, 28 Sep 2015 00:30:10 +0200
-Subject: configure.ac: add explicit enable/disable for systemd-login support
-Otherwise, auto-enable depending on whether the system has the necessary
-libraries.
-[Updated help text as per pq suggestion -- bwh]
-Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-Upstream-Status: Backport
-Backported from Weston git:
-http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc
-Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
-diff --git a/configure.ac b/configure.ac
-index a9cd429..67e80d0 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
-       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
- 
-PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-                  [libsystemd >= 209],
-                  [have_systemd_login_209=yes;have_systemd_login=yes],
-                  [have_systemd_login_209=no;have_systemd_login=no])
-
-# Older versions of systemd package systemd-login separately. Fall back on that
-AS_IF([test x$have_systemd_login != xyes],[
-      PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-                        [libsystemd-login >= 198],
-                        [have_systemd_login=yes],
-                        [have_systemd_login=no])
-      ])
-+AC_ARG_ENABLE(systemd-login,
-+              AS_HELP_STRING([--enable-systemd-login],
-+                             [Enable logind support]),,
-+              enable_systemd_login=auto)
-+if test x$enable_systemd_login != xno; then
-+  PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+                    [libsystemd >= 209],
-+                    [have_systemd_login_209=yes;have_systemd_login=yes],
-+                    [have_systemd_login_209=no;have_systemd_login=no])
-+
-+  # Older versions of systemd package systemd-login separately. Fall back on that
-+  AS_IF([test x$have_systemd_login != xyes],[
-+        PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+                          [libsystemd-login >= 198],
-+                          [have_systemd_login=yes],
-+                          [have_systemd_login=no])
-+        ])
-+else
-+  have_systemd_login=no
-+fi
-+
-+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
-+  AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login])
-+fi
- 
- AS_IF([test "x$have_systemd_login" = "xyes"],
-       [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
-- 
-cgit v0.10.2
diff --git a/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch b/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch
deleted file mode 100644
index 2d28d56..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001
-From: Frederico Cadete <frederico@cadete.eu>
-Date: Mon, 28 Sep 2015 00:30:09 +0200
-Subject: configure.ac: add support for new versions of systemd
-Starting from systemd version 209, a single libsystemd.pc is provided.
-For previous versions, fall back on libsystemd-login.pc.
-Signed-off-by: Frederico Cadete <frederico@cadete.eu>
-Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
-Upstream-Status: Backport
-Backported from Weston git:
-http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025
-Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
-diff --git a/configure.ac b/configure.ac
-index 045291c..a9cd429 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
-       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
- 
-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198],
-                  [have_systemd_login=yes], [have_systemd_login=no])
-+PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+                  [libsystemd >= 209],
-+                  [have_systemd_login_209=yes;have_systemd_login=yes],
-+                  [have_systemd_login_209=no;have_systemd_login=no])
-+
-+# Older versions of systemd package systemd-login separately. Fall back on that
-+AS_IF([test x$have_systemd_login != xyes],[
-+      PKG_CHECK_MODULES(SYSTEMD_LOGIN,
-+                        [libsystemd-login >= 198],
-+                        [have_systemd_login=yes],
-+                        [have_systemd_login=no])
-+      ])
-+
- AS_IF([test "x$have_systemd_login" = "xyes"],
-       [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
- AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
- 
-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209],
-                  [have_systemd_login_209=yes], [have_systemd_login_209=no])
- AS_IF([test "x$have_systemd_login_209" = "xyes"],
-       [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
- 
-- 
-cgit v0.10.2
diff --git a/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch
deleted file mode 100644
index 35e6d6f..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-weston-1.5.0/configure.ac: make lcms explicitly configurable
-The lcms package is outside of openembedded-core, so make it
-explicitly configurable. Make it deterministic, so that if lcms
-dependencies are missing, autoconf throws a fatal error. Follow
-upstream style to make it more likely to be merged.
-Upstream-Status: Pending
-Index: weston-1.5.0/configure.ac
-===================================================================
--- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install,
-                             enable_demo_clients_install=no)
- AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
- 
-PKG_CHECK_MODULES(LCMS, lcms2,
-                  [have_lcms=yes], [have_lcms=no])
-if test "x$have_lcms" = xyes; then
-       AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
-+AC_ARG_ENABLE(lcms,
-+              AS_HELP_STRING([--disable-lcms],
-+                             [Disable lcms support]),,
-+              enable_lcms=auto)
-+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
-+if test "x$enable_lcms" != "xno"; then
-+        PKG_CHECK_MODULES(LCMS, 
-+                         lcms2,
-+                         [have_lcms=yes],
-+                         [have_lcms=no])
-+        if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
-+          AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
-+        fi
-+        if test "x$have_lcms" = "xyes"; then
-+                enable_lcms=yes
-+                AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
-+        fi
- fi
-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
- 
- AC_PATH_PROG([wayland_scanner], [wayland-scanner])
- if test x$wayland_scanner = x; then
diff --git a/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch
deleted file mode 100644
index ad07d4f..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The libwebp package is outside of openembedded-core, so make it
-explicitly configurable. Make it deterministic, so that if libwebp 
-dependencies are missing, autoconf throws a fatal error.
-Upstream-Status: Pending
-Index: weston-1.5.0/configure.ac
-===================================================================
--- weston-1.5.0.orig/configure.ac
-+++ weston-1.5.0/configure.ac
-@@ -268,9 +268,22 @@ fi
- 
- PKG_CHECK_MODULES(PIXMAN, [pixman-1])
- PKG_CHECK_MODULES(PNG, [libpng])
-PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
-AS_IF([test "x$have_webp" = "xyes"],
-      [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-+AC_ARG_ENABLE(webp,
-+              AS_HELP_STRING([--disable-webp],
-+                             [Disable libwebp support]),,
-+              enable_webp=auto)
-+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes])
-+AS_IF([test "x$enable_webp" != "xno"],
-+    PKG_CHECK_MODULES(WEBP,
-+                     [libwebp],
-+                     [have_webp=yes],
-+                     [have_webp=no])
-+    AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"],
-+        AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found]))
-+    AS_IF([test "x$have_webp" = "xyes"],
-+        [enable_webp=yes]
-+        [AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
-+)
- 
- AC_ARG_ENABLE(vaapi-recorder, [  --enable-vaapi-recorder],,
-              enable_vaapi_recorder=auto)
diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.desktop b/meta-nvidia-extras/recipes/weston/weston/weston.desktop
deleted file mode 100644
index 1086ae8..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/weston.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Weston
-Comment=Wayland Compostitor
-Exec=weston
-Icon=weston
-Terminal=false
-Categories=Utility;
diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.png b/meta-nvidia-extras/recipes/weston/weston/weston.png
deleted file mode 100644
index ea8b7e0..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/weston.png
+++ /dev/null
Binary files differ
diff --git a/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start b/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start
deleted file mode 100644
index b483c97..0000000
--- a/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if type Xwayland  >/dev/null 2>/dev/null; then
-        mkdir -p /tmp/.X11-unix
-        add_weston_argument "--modules=xwayland.so"
-fi
diff --git a/meta-nvidia-extras/recipes/weston/weston_%.bbappend b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
index e9a2154..c58b81b 100644
--- a/meta-nvidia-extras/recipes/weston/weston_%.bbappend
+++ b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
@@ -1,33 +1,72 @@
-############################################################################
+# Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
-##
+#
-## Copyright (C) 2017 The Qt Company Ltd.
+# This program is free software; you can redistribute it and/or modify it
-## Contact: https://www.qt.io/licensing/
+# under the terms and conditions of the GNU General Public License,
-##
+# version 2, as published by the Free Software Foundation.
-## This file is part of the Boot to Qt meta layer.
+#
-##
+# This program is distributed in the hope it will be useful, but WITHOUT
-## $QT_BEGIN_LICENSE:GPL$
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## Commercial License Usage
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-## Licensees holding valid commercial Qt licenses may use this file in
+# more details.
-## accordance with the commercial license agreement provided with the
+#
-## Software or, alternatively, in accordance with the terms contained in
+# You should have received a copy of the GNU General Public License
-## a written agreement between you and The Qt Company. For licensing terms
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
+LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-##
+                    file://src/compositor.c;endline=24;md5=70efe6a96837805b300f0317a6306837"
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
+SRC_URI = "file://${LNX_TOPDIR}/samples/wayland/weston \
-## General Public License version 3 or (at your option) any later version
+           file://NVIDIA-weston-configure.patch"
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
+FILESEXTRAPATHS_prepend := "${THISDIR}/../${PN}:"
-## included in the packaging of this file. Please review the following
+PV = "1.11.0"
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston"
-##
+B = "${S}"
-## $QT_END_LICENSE$
-##
+DEPENDS += "wayland-egl tegra-drivers"
-############################################################################
+PACKAGECONFIG = "egl kms libinput"
-PACKAGECONFIG_remove = "kms"
-DEPENDS += "drm"
+# Fix warnings by removing redundant configure flags passed to weston
+EXTRA_OECONF_remove = "--enable-libinput-backend --disable-webp --disable-lcms"
-TARGET_CFLAGS += "-DWIN_INTERFACE_CUSTOM"
+#
+# Compositor choices
+#
+# Weston with EGL support
+PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
+# Weston on egloutput
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mtdev"
+CFLAGS += " -DWAYLAND=1 "
+LDFLAGS += " -lnvidia-egl-wayland "
+do_configure_prepend() {
+    cd ${S}
+    NOCONFIGURE=1 ./autogen.sh
+    cd ${B}
+}
+do_install_append() {
+    # create dir
+    install -d ${D}/${ROOT_HOME}/.config
+    sed -i 's/\/usr\/local\/bin\/weston-ivi-shell-user-interface/\/usr\/lib\/weston\/weston-ivi-shell-user-interface/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/background.png/\/usr\/share\/weston\/background.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/panel.png/\/usr\/share\/weston\/panel.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/tiling.png/\/usr\/share\/weston\/tiling.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/sidebyside.png/\/usr\/share\/weston\/sidebyside.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/fullscreen.png/\/usr\/share\/weston\/fullscreen.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/home.png/\/usr\/share\/weston\/home.png/g' ${S}/tools/weston.ini
+    sed -i 's/\/usr\/local\/share\/weston\/random.png/\/usr\/share\/weston\/random.png/g' ${S}/tools/weston.ini
+    # weston.ini
+    install -m 0775 ${S}/tools/weston.ini ${D}/${ROOT_HOME}/.config
+    sed -i 's/\/include/\/include\/weston/g' ${D}/usr/lib/pkgconfig/weston.pc
+}
+FILES_${PN} += " ${ROOT_HOME}/* ${ROOT_HOME}/.config "
+ALLOW_EMPTY_${PN}-examples = "1"
diff --git a/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb b/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb
deleted file mode 100644
index 3fdfbab..0000000
--- a/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb
+++ /dev/null
@@ -1,104 +0,0 @@
-SUMMARY = "Weston, a Wayland compositor"
-DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
-HOMEPAGE = "http://wayland.freedesktop.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331"
-SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-           file://weston.png \
-           file://weston.desktop \
-           file://make-lcms-explicitly-configurable.patch \
-           file://make-libwebp-explicitly-configurable.patch \
-           file://0001-make-error-portable.patch \
-           file://libsystemd.patch \
-           file://explicit-enable-disable-systemd.patch \
-           file://add-config-option-for-no-input-device.patch \
-"
-SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
-SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
-inherit autotools pkgconfig useradd distro_features_check
-# depends on virtual/egl
-REQUIRED_DISTRO_FEATURES = "opengl"
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland libinput virtual/egl pango wayland-native"
-EXTRA_OECONF = "--enable-setuid-install \
-                --enable-simple-clients \
-                --enable-clients \
-                --enable-demo-clients-install \
-                --disable-rpi-compositor \
-                --disable-rdp-compositor \
-                "
-EXTRA_OECONF_append_qemux86 = "\
-        WESTON_NATIVE_BACKEND=fbdev-backend.so \
-        "
-EXTRA_OECONF_append_qemux86-64 = "\
-        WESTON_NATIVE_BACKEND=fbdev-backend.so \
-        "
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
-                  "
-#
-# Compositor choices
-#
-# Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
-# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
-# Weston on X11
-PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
-# Headless Weston
-PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
-# Weston on framebuffer
-PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
-# weston-launch
-PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm"
-# VA-API desktop recorder
-PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
-# Weston with EGL support
-PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
-# Weston with cairo glesv2 support
-PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
-# Weston with lcms support
-PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
-# Weston with webp support
-PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
-# Weston with unwinding support
-PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
-# Weston with systemd-login support
-PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
-# Weston with Xwayland support
-PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo"
-# colord CMS support
-PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
-do_install_append() {
-    # Weston doesn't need the .la files to load modules, so wipe them
-    rm -f ${D}/${libdir}/weston/*.la
-    # If X11, ship a desktop file to launch it
-    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then
-        install -d ${D}${datadir}/applications
-        install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
-        install -d ${D}${datadir}/icons/hicolor/48x48/apps
-        install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
-}
-PACKAGES += "${PN}-examples"
-FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
-FILES_${PN}-examples = "${bindir}/*"
-RDEPENDS_${PN} += "xkeyboard-config"
-RRECOMMENDS_${PN} = "liberation-fonts"
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system weston-launch"
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
index 9e64b87..0e85afe 100644
--- a/meta-raspberrypi-extras/conf/layer.conf
+++ b/meta-raspberrypi-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_rpi"
 BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_rpi = "20"
+LAYERSERIES_COMPAT_b2qt_rpi = "sumo"
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
deleted file mode 100644
index 1b8e44e..0000000
--- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-do_deploy_append() {
-    echo "dtparam=audio=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-}
diff --git a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
deleted file mode 100644
index 5f5e919..0000000
--- a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Need to make this conditional to gstreamer1
-#
-SRC_URI_append_rpi = " \
-             file://0001-config-files-path.patch \
-             file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
-             file://0002-fix-decoder-flushing.patch \
-             file://0003-no-timeout-on-get-state.patch \
-             file://0004-Properly-handle-drain-requests-while-flushing.patch \
-             file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
-"
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12:"
diff --git a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch
new file mode 100644
index 0000000..d21fd09
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch
@@ -0,0 +1,34 @@
+From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001
+From: Hugo Hromic <hhromic@gmail.com>
+Date: Sun, 13 May 2018 10:49:04 +0100
+Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import
+The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which
+expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos.
+However, the older version included in userland does not provide it.
+This patch backports the missing typedef from recent Khronos into userland.
+See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h>
+Submitted to userland in <https://github.com/raspberrypi/userland/pull/467>
+Upstream-Status: Submitted
+---
+ interface/khronos/include/EGL/eglext.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h
+index 89a3369..87cf7d2 100755
+--- a/interface/khronos/include/EGL/eglext.h
+++ b/interface/khronos/include/EGL/eglext.h
+@@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy
+ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+ #endif
+ 
+#ifndef EGL_KHR_uint64_typedef
+#define EGL_KHR_uint64_typedef 1
+typedef khronos_uint64_t EGLuint64KHR;
+#endif /* EGL_KHR_uint64_typedef */
+ 
+ #ifdef __cplusplus
+ }
diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend
index ab69a09..dc421e5 100644
--- a/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend
+++ b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend
@@ -29,10 +29,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://init-device.sh"
+SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch"
-do_install_append () {
+SRCREV = "2448644657e5fbfd82299416d218396ee1115ece"
-    install -m 0755 ${WORKDIR}/init-device.sh ${D}/init-device
+PV = "20180511"
-}
-FILES_${PN} += "/init-device"
diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf
index 36091df..83dde0e 100644
--- a/meta-renesas-extras/conf/layer.conf
+++ b/meta-renesas-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_renesas"
 BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_renesas = "20"
+LAYERSERIES_COMPAT_b2qt_renesas = "sumo"
diff --git a/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
index 801a073..8a62d82 100644
--- a/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
+++ b/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,5 @@
 ##
 ############################################################################
-CFLAGS[unexport] = ""
+LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"
-CFLAGS = "-Wno-error=pedantic"
+SRCREV = "dcb310296c07bce69149fa9d74f1848cdfd01f5a"
diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 85be953..9658abf 100644
--- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-DEPENDS += "wayland-kms libgbm"
+DEPENDS_append_draak = " wayland-kms libgbm"
diff --git a/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend b/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend
new file mode 100644
index 0000000..ad0959f
--- /dev/null
+++ b/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+EXTRA_OEMAKE_append_draak = " COMMON_FLAGS="-Wno-error=expansion-to-defined""
diff --git a/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
index 35f66f4..19fbff6 100644
--- a/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,5 +27,5 @@
 ##
 ############################################################################
-RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
+# upstream recipe includes kernel module to wrong package
-PROVIDES += "virtual/libgbm"
+FILES_${PN}_draak = ""
diff --git a/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend
new file mode 100644
index 0000000..19fbff6
--- /dev/null
+++ b/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+# upstream recipe includes kernel module to wrong package
+FILES_${PN}_draak = ""
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch b/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch
new file mode 100644
index 0000000..f7e0c48
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch
@@ -0,0 +1,124 @@
+From 32e78d93f53889686bc1d90865fcc33ec5c9e80d Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Thu, 2 Mar 2017 12:17:22 -0800
+Subject: [PATCH] give up on gcc ilog2() constant optimizations
+gcc-7 has an "optimization" pass that completely screws up, and
+generates the code expansion for the (impossible) case of calling
+ilog2() with a zero constant, even when the code gcc compiles does not
+actually have a zero constant.
+And we try to generate a compile-time error for anybody doing ilog2() on
+a constant where that doesn't make sense (be it zero or negative).  So
+now gcc7 will fail the build due to our sanity checking, because it
+created that constant-zero case that didn't actually exist in the source
+code.
+There's a whole long discussion on the kernel mailing about how to work
+around this gcc bug.  The gcc people themselevs have discussed their
+"feature" in
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
+but it's all water under the bridge, because while it looked at one
+point like it would be solved by the time gcc7 was released, that was
+not to be.
+So now we have to deal with this compiler braindamage.
+And the only simple approach seems to be to just delete the code that
+tries to warn about bad uses of ilog2().
+So now "ilog2()" will just return 0 not just for the value 1, but for
+any non-positive value too.
+It's not like I can recall anybody having ever actually tried to use
+this function on any invalid value, but maybe the sanity check just
+meant that such code never made it out in public.
+Reported-by: Laura Abbott <labbott@redhat.com>
+Cc: John Stultz <john.stultz@linaro.org>,
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/log2.h       | 13 ++-----------
+ tools/include/linux/log2.h | 13 ++-----------
+ 2 files changed, 4 insertions(+), 22 deletions(-)
+diff --git a/include/linux/log2.h b/include/linux/log2.h
+index fd7ff3d91e6a..f38fae23bdac 100644
+--- a/include/linux/log2.h
+++ b/include/linux/log2.h
+@@ -15,12 +15,6 @@
+ #include <linux/types.h>
+ #include <linux/bitops.h>
+ 
+-/*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+ /*
+  * non-constant log of base 2 calculators
+  * - the arch may override these in asm/bitops.h if they can be implemented
+@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n)                               \
+ (                                              \
+        __builtin_constant_p(n) ? (             \
+-               (n) < 1 ? ____ilog2_NaN() :     \
+               (n) < 2 ? 0 :                   \
+                (n) & (1ULL << 63) ? 63 :       \
+                (n) & (1ULL << 62) ? 62 :       \
+                (n) & (1ULL << 61) ? 61 :       \
+@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+                (n) & (1ULL <<  4) ?  4 :       \
+                (n) & (1ULL <<  3) ?  3 :       \
+                (n) & (1ULL <<  2) ?  2 :       \
+-               (n) & (1ULL <<  1) ?  1 :       \
+-               (n) & (1ULL <<  0) ?  0 :       \
+-               ____ilog2_NaN()                 \
+-                                  ) :          \
+               1 ) :                           \
+        (sizeof(n) <= 4) ?                      \
+        __ilog2_u32(n) :                        \
+        __ilog2_u64(n)                          \
+diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h
+index 41446668ccce..d5677d39c1e4 100644
+--- a/tools/include/linux/log2.h
+++ b/tools/include/linux/log2.h
+@@ -12,12 +12,6 @@
+ #ifndef _TOOLS_LINUX_LOG2_H
+ #define _TOOLS_LINUX_LOG2_H
+ 
+-/*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+ /*
+  * non-constant log of base 2 calculators
+  * - the arch may override these in asm/bitops.h if they can be implemented
+@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n)                               \
+ (                                              \
+        __builtin_constant_p(n) ? (             \
+-               (n) < 1 ? ____ilog2_NaN() :     \
+               (n) < 2 ? 0 :                   \
+                (n) & (1ULL << 63) ? 63 :       \
+                (n) & (1ULL << 62) ? 62 :       \
+                (n) & (1ULL << 61) ? 61 :       \
+@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+                (n) & (1ULL <<  4) ?  4 :       \
+                (n) & (1ULL <<  3) ?  3 :       \
+                (n) & (1ULL <<  2) ?  2 :       \
+-               (n) & (1ULL <<  1) ?  1 :       \
+-               (n) & (1ULL <<  0) ?  0 :       \
+-               ____ilog2_NaN()                 \
+-                                  ) :          \
+               1 ) :                           \
+        (sizeof(n) <= 4) ?                      \
+        __ilog2_u32(n) :                        \
+        __ilog2_u64(n)                          \
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend
new file mode 100644
index 0000000..1a9a9da
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:"
+SRC_URI_append_draak = " file://0001-give-up-on-gcc-ilog2-constant-optimizations.patch"
diff --git a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
index 0542b65..1da4547 100644
--- a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
+++ b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend
@@ -1,10 +1,31 @@
-require include/gles-control.inc
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
-def map_libs(d):
+# pick random header to make build work
-    if base_conditional('USE_GLES_WAYLAND', "1", "1", "0", d) == "1":
+INSTALLED_HEADER_draak = "src/egl/wayland/wayland-egl/wayland-egl-backend.h"
-        return "wayland"
-    return "dummy"
-MESATARGET := "${@map_libs(d)}"
-include recipes-graphics/mesa/mesa-${MESATARGET}.inc
diff --git a/meta-renesas-extras/recipes/optee-os/optee-os_git.bbappend b/meta-renesas-extras/recipes/optee-os/optee-os_git.bbappend
deleted file mode 100644
index 03862c5..0000000
--- a/meta-renesas-extras/recipes/optee-os/optee-os_git.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-CFLAGS = "-Wno-error=unused-const-variable= -Wno-error=strict-aliasing -Wno-error=shift-negative-value"
diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf
new file mode 100644
index 0000000..4cbbf49
--- /dev/null
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf
@@ -0,0 +1,9 @@
+{
+  "device": "/dev/dri/card0",
+  "outputs": [
+    {
+      "name": "VGA1",
+      "mode": "off"
+    }
+  ]
+}
diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf
new file mode 100644
index 0000000..4cbbf49
--- /dev/null
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf
@@ -0,0 +1,9 @@
+{
+  "device": "/dev/dri/card0",
+  "outputs": [
+    {
+      "name": "VGA1",
+      "mode": "off"
+    }
+  ]
+}
diff --git a/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch b/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch
new file mode 100644
index 0000000..ed1339b
--- /dev/null
+++ b/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch
@@ -0,0 +1,28 @@
+From 4b59d8fa3ba5647834d29fad58b9231c154b9136 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 16 Oct 2018 13:43:43 +0300
+Subject: [PATCH] Workaround missing eglGetProcAddress
+Renesas boards are unable to find address for the eglGetProcAddress
+symbol at runtime, instead do it already at link time.
+Task-number: QTBUG-71152
+Change-Id: Ibc4251c0ab7e878a65d8c6e7b4da3952807cbc91
+---
+ src/core/ozone/gl_ozone_egl_qt.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
+index 2fa86d79..d2362477 100644
+--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
+@@ -98,6 +98,9 @@ bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
+     }
+ #endif
+ 
+    if (!get_proc_address)
+        get_proc_address = &eglGetProcAddress;
+
+     if (!get_proc_address) {
+         LOG(ERROR) << "eglGetProcAddress not found.";
+         base::UnloadNativeLibrary(eglgles2Library);
diff --git a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend b/meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend
index bac366d..cc13b74 100644
--- a/meta-boot2qt-distro/recipes-connectivity/openssl/openssl_1.%.bbappend
+++ b/meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,7 +28,5 @@
 ############################################################################
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
-PACKAGECONFIG += "perl"
+SRC_URI += "file://0001-Workaround-missing-eglGetProcAddress.patch"
diff --git a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend b/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
index 47fe2ce..3a7bb52 100644
--- a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
+++ b/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,14 +27,14 @@
 ##
 ############################################################################
-LICENSE = "GPLv2+"
+FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append_draak = " file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch"
-SRC_URI += "file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch"
+LICENSE_draak = "GPLv2+"
-S = "${WORKDIR}/git"
+S_draak = "${WORKDIR}/git"
-do_deploy_prepend() {
+do_deploy_prepend_draak() {
    cp ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC}
 }
diff --git a/meta-renesas-extras/recipes/wayland/libgbm.bbappend b/meta-renesas-extras/recipes/wayland/libgbm.bbappend
index fd11a50..502c7cc 100644
--- a/meta-renesas-extras/recipes/wayland/libgbm.bbappend
+++ b/meta-renesas-extras/recipes/wayland/libgbm.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,3 +28,10 @@
 ############################################################################
 PROVIDES += "virtual/libgbm"
+DEPENDS_append_draak = " udev"
+SRCREV = "a0c7d6c97fe1fffe45eee524060cbb12767c6461"
+SRCREV_draak = "bc04aefc9d5322f8b2dc1ecb15d0713bbab684b8"
+SRC_URI = "git://github.com/renesas-rcar/libgbm;branch=rcar-gen3"
diff --git a/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend b/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend
index 0cd3eec..1330d5f 100644
--- a/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend
+++ b/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-DEPENDS += "wayland-native"
+DEPENDS_append_draak = " wayland-native"
diff --git a/meta-renesas-extras/recipes/wayland/weston_%.bbappend b/meta-renesas-extras/recipes/wayland/weston_%.bbappend
new file mode 100644
index 0000000..9385f7a
--- /dev/null
+++ b/meta-renesas-extras/recipes/wayland/weston_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+EXTRA_OECONF_append_draak = " WAYLAND_PROTOCOLS_SYSROOT_DIR="
diff --git a/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend b/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend
deleted file mode 100644
index ef14c2f..0000000
--- a/meta-renesas-extras/recipes/wayland/weston_1.11.0.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-EXTRA_OECONF += "WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}"
diff --git a/meta-smx6-extras/conf/layer.conf b/meta-smx6-extras/conf/layer.conf
index 566fb41..8a68860 100644
--- a/meta-smx6-extras/conf/layer.conf
+++ b/meta-smx6-extras/conf/layer.conf
@@ -43,3 +43,5 @@ BBFILE_PRIORITY_b2qt_smx6 = "20"
 LAYERDEPENDS_smx6 = ""
 # meta-smx6 layer.conf modifies qtbase PACKAGECONFIG
 PACKAGECONFIG_remove_pn-qtbase = "examples"
+LAYERSERIES_COMPAT_b2qt_smx6 = "sumo"
diff --git a/meta-tegra-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf
index c170570..f5b4906 100644
--- a/meta-tegra-extras/conf/layer.conf
+++ b/meta-tegra-extras/conf/layer.conf
@@ -38,3 +38,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_tegra"
 BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_tegra = "20"
+LAYERSERIES_COMPAT_b2qt_tegra = "sumo"
diff --git a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
deleted file mode 100644
index bf4cc08..0000000
--- a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-inherit update-alternatives
-do_install_append() {
-    mv ${D}${libdir}/libdrm.so.2.4.0 ${D}${libdir}/libdrm-freedesktop.so.2.4.0
-    rm ${D}${libdir}/libdrm.so
-    rm ${D}${libdir}/libdrm.so.2
-    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so
-    ln -sf libdrm-freedesktop.so.2.4.0 ${D}${libdir}/libdrm.so.2
-}
-ALTERNATIVE_${PN} = "libdrm.so.2.4.0 libdrm.so.2"
-ALTERNATIVE_LINK_NAME[libdrm.so.2.4.0] = "${libdir}/libdrm.so.2.4.0"
-ALTERNATIVE_LINK_NAME[libdrm.so.2] = "${libdir}/libdrm.so.2"
-ALTERNATIVE_TARGET = "${libdir}/libdrm-freedesktop.so.2.4.0"
-ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
index d3c4803..1450622 100644
--- a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
+++ b/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,5 +31,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "\
    file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \
    "
-require recipes-kernel/linux/linux-dtb.inc
diff --git a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
deleted file mode 100644
index 84a817c..0000000
--- a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-PACKAGES += "${PN}-dev"
-RRECOMMENDS_${PN}-dev += "\
-    libgles1-mesa-dev \
-    libgles2-mesa-dev \
-    libgles3-mesa-dev \
-    libegl-mesa-dev \
-    libgl-mesa-dev \
-    "
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
index e39649f..3a43fd7 100644
--- a/meta-toradex-extras/conf/layer.conf
+++ b/meta-toradex-extras/conf/layer.conf
@@ -38,3 +38,9 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
 BBFILE_COLLECTIONS += "b2qt_toradex"
 BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_toradex = "20"
+LAYERSERIES_COMPAT_b2qt_toradex = "sumo"
+# override toradex layer COMPATs
+LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo"
+LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
index 1535234..1f63fee 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
+++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
@@ -1,4 +1,4 @@
-From 37a2e407172b37a880d04c5a7721aeff498854ad Mon Sep 17 00:00:00 2001
+From 823475bf681e1dbb4ad8e43935232ae39b918d9c Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 6 Oct 2017 15:54:35 +0300
 Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb
@@ -6,24 +6,25 @@ Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb
 Need to disable fusion touch to get the new atmel mxt multitouch
 controller to work.
 ---
- arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 3 ++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
-index 354bf80d..1181502 100644
+index 26525e24a6c7..78a1011c1ea2 100644
 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
 +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
-@@ -166,7 +166,6 @@
+@@ -160,7 +160,7 @@
-                reg = <0x4a>;
                interrupt-parent = <&gpio6>;
                interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+                reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
 -               status = "disabled";
+               status = "okay";
        };
 
        pcap@10 {
-@@ -176,6 +175,7 @@
+@@ -170,6 +170,7 @@
-                gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */
+                gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */
-                         &gpio6  9 0 /* MXM3 13, Reset */
+                         &gpio6  9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */
                        >;
 +               status = "disabled";
        };
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend
index eadfa15..eadfa15 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 3910d63..2adcbbf 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -18,69 +18,74 @@
  <project name="poky"
           remote="yocto"
-           revision="b0ede5088b2f4338ea5faf5db46d67eb1c7e8243"
+           revision="36d5cee56bd389ecbe66dbfad9e5d57c13b56b95"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="9eaebc6e783f1394bb5444326cd05a976b3122e9"
+           revision="2bb21ef27c4b0c9d52d30b3b2c5a0160fd02b966"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="qtyocto"
-           revision="3439f344fbb4c1ee2b13ddb54435716c53d79be2"
+           revision="decb5d93229f8c381e7509e139bf0c865d8ab0c3"
           path="sources/meta-qt5"/>
  <project name="meta-mingw"
           remote="qtyocto"
-           revision="2a5619ffdc0f02f57e0c36387fd25c8540c60a8a"
+           revision="fde300483f2133489c1f16b5b03a22050613787b"
           path="sources/meta-mingw"/>
  <project name="meta-freescale"
           remote="freescale"
-           revision="af5a8cf74d488ba45715ed0b0e0441e60b10c31d"
+           revision="2813c0c59a81498afab26a2b1f90db07728df2ed"
           path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,smx6,renesas-gen3,boundary,fsl-imx8"/>
+           groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
  <project name="meta-freescale-3rdparty"
           remote="freescale"
-           revision="9613dbc02ca970122a01c935bc9e5789ced73a9d"
+           revision="ba684412e6983eeda0ef7158a724305f0f1a2f0a"
           path="sources/meta-freescale-3rdparty"
           groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
  <project name="meta-raspberrypi"
           remote="yocto"
-           revision="f2e2a4376e84dec6e5efeabaa86a4406fddf7dcd"
+           revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97"
           path="sources/meta-raspberrypi"
           groups="notdefault,external,rpi"/>
  <project name="meta-intel"
           remote="intel"
-           revision="9b37952d6af36358b6397cedf3dd53ec8962b6bf"
+           revision="b736eed4746899e76a84545471bf06da09a8b64a"
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
  <project name="meta-tegra"
           remote="madisongh"
-           revision="4aea5e3785dc400e31981467f475b54e652dbd67"
+           revision="6b6942c8dd15c2b4a460d46e803b962663955fde"
           path="sources/meta-tegra"
           groups="notdefault,external,jetson"/>
  <project name="meta-renesas"
           remote="renesas"
-           revision="95cb48ba09bc7e55fd549817e3e26723409e68d5"
+           revision="276e6ae724d7e604e0d28e4670b8c9edea2957e3"
           path="sources/meta-renesas"
           groups="notdefault,external,renesas-gen3"/>
+  <project name="meta-renesas"
+           remote="renesas"
+           revision="0f865eb8b464ca717b1651e10c4ddc0c4f798423"
+           path="sources/meta-renesas-D3"
+           groups="notdefault,external,renesas-draak"/>
  <project name="meta-linaro"
           remote="linaro"
-           revision="74dacb34c13d1c85fe4627a890b9c04940f9ffeb"
+           revision="282b47a10940c26854c1cca0ec40950192af16fc"
           path="sources/meta-linaro"
-           groups="notdefault,external,renesas-gen3"/>
+           groups="notdefault,external,renesas-gen3,renesas-draak"/>
  <project name="meta-toradex-bsp-common"
           remote="toradex"
-           revision="b6b6be765ba19454246a488f24873b9ef1f4cb78"
+           revision="3e713eef6e056c955b82adaf4b45286a98c3fcdf"
           path="sources/meta-toradex-bsp-common"
           groups="notdefault,external,toradex"/>
  <project name="meta-toradex-nxp"
           remote="toradex"
-           revision="c4f34b34bf34f44b974a7add623cafff17d880ad"
+           revision="656677f4a68e6747971a4a30550cd72c3beb6a76"
           path="sources/meta-toradex-nxp"
           groups="notdefault,external,toradex"/>
  <project name="meta-boundary"
           remote="boundary"
-           revision="42b00061076b2a6e15c1eeed7da6fc14a0dae9d8"
+           revision="107a7ceba84b87e1e2a463fea27ae5c53c4e452f"
           path="sources/meta-boundary"
           groups="notdefault,external,boundary"/>
  <project name="meta-fsl-bsp-release"
@@ -91,17 +96,17 @@
  <project name="nvidia-layer"
           remote="playground"
-           revision="1fa971efec70d999ac2a57782c12625fb70e5c76"
+           revision="af6f41cb527f35263cf7bfde222d92600f5e66e2"
           path="sources/nvidia-layer"
           groups="notdefault,internal"/>
-  <project name="vibrante-t186"
+  <project name="drive-t186"
           remote="playground"
-           revision="5e04f79155936ae10bbbea72e012336be6631448"
+           revision="a3dc22511ed845b7fe85a7b26c64b1c37a4763c4"
-           path="sources/vibrante-t186"
+           path="sources/drive-t186"
           groups="notdefault,internal"/>
  <project name="renesas-rcar-gen3"
           remote="playground"
-           revision="41c966df95fad1d8fca5c24676c437a46e997c5f"
+           revision="53a345942e4207b2fa1b19d932b5b72bd5c4761c"
           path="sources/renesas-rcar-gen3"
           groups="notdefault,internal"/>
  <project name="meta-smx6"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 44f529c..5520f53 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -65,7 +65,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    nitrogen6x|nitrogen7)
      LAYERSCONF="bblayers.conf.boundary.sample"
    ;;
-    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
+    imx6qdlsabresd|imx7dsabresd|imx7s-warp)
      LAYERSCONF="bblayers.conf.fsl.sample"
    ;;
    smarc-samx6i)
@@ -80,9 +80,12 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    tegra-x1|tegra-t18x)
      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
    ;;
-    salvator-x|h3ulcb|m3ulcb)
+    salvator-x|h3ulcb|m3ulcb|ebisu)
      LAYERSCONF="bblayers.conf.rcar-gen3.sample"
    ;;
+    draak)
+      LAYERSCONF="bblayers.conf.draak.sample"
+    ;;
    emulator)
      LAYERSCONF="bblayers.conf.emulator.sample"
    ;;
diff --git a/scripts/upload.sh b/scripts/upload.sh
index e77f96d..9d4448c 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -38,6 +38,8 @@ UPLOADS="\
    tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \
    tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \
    tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \
+    tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}-${RELEASE}.qbsp \
+    tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}-${RELEASE}.qbsp \
    "
 for f in ${UPLOADS}; do