Merge remote-tracking branch 'origin/dev' into morty

* origin/dev:

  deviceutilities: update to newer version
  qt5: update submodules
  fsl: update freescale meta layers & related .bbappend entries
  sdk: use python3 for toolchain
  qtivi: update to version that compiles with Qt 5.9
  warp7: add kernel configs to right file
  Add support for i.MX7S WaRP
  Update and re-enable QtQuickCompiler
  use newer meta-qt5
  Merge remote-tracking branch 'origin/krogoth' into dev
  qt5: use newer meta-qt5
  poky: update morty branch
  neptune-ui: update revision
  qtbase: disable eglfs device integration plugin usage in emulator
  neptune-ui: depends on qttools-native
  Multiscreen-demo: update revision
  neptune-ui: rdepends on dbus-session
  qt5: use newer meta-qt5
  Revert "qtglesstream: update to newer version"
  multiscreen-demo: update revision
  qtivi: Update to the latest version
  neptune-ui: Update to the latest version
  neptune: update to latest version
  toradex: add missing USB kernel config for colibri vf

Change-Id: I34414fac9a5eedeb028bcd06988ca23c2eea5549

25 files changed, 114 insertions, 96 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index e90188a..d72d28c 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -109,7 +109,7 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       PROJECT_GROUPS="fsl"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
diff --git a/conf/distro/include/imx7s-warp.conf b/conf/distro/include/imx7s-warp.conf
new file mode 100644
index 0000000..fdd7f17
--- /dev/null
+++ b/conf/distro/include/imx7s-warp.conf
@@ -0,0 +1,37 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+include conf/distro/include/fsl.inc
+
+DEPLOY_CONF_NAME = "i.MX7S WaRP"
+
+PREFERRED_PROVIDER_virtual/egl = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+
+DISTRO_FEATURES_remove = "webengine wayland"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 81fd5c7..f98c43b 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -283,7 +283,6 @@ INHERIT += "internal-build"
 
 # Enables use of QtQuickCompiler if you have access to the gerrit project
 #ENABLE_QTQUICKCOMPILER = "1"
-DISABLE_QTQUICKCOMPILER = "1"
 
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
index 4c472db..068b9fa 100644
--- a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
+++ b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend
@@ -29,4 +29,4 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:"
 
-COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|wandboard-dual|wandboard-quad)"
+COMPATIBLE_MACHINE = "(cubox-i|nitrogen6x|nitrogen6x-lite|wandboard|imx6sl-warp)"
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 c4e0158..9a50c92 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -35,12 +35,7 @@ do_preconfigure_prepend() {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
-    echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 
     echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index c4e0158..208ec74 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -35,11 +35,7 @@ do_preconfigure_prepend() {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
-    echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 
     echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
     echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index f8fac0d..58c64de 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -33,5 +33,4 @@ RDEPENDS_kernel-base = ""
 do_preconfigure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 5a92f25..431005b 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -32,6 +32,5 @@ RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
 do_preconfigure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
     echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
new file mode 100644
index 0000000..5efcce0
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
@@ -0,0 +1,34 @@
+############################################################################
+##
+## 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_configure_prepend() {
+    echo "CONFIG_NAMESPACES=y"      >> ${B}/.config
+    echo "CONFIG_FHANDLE=y"         >> ${B}/.config
+    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
+}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
deleted file mode 100644
index d1f5616..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 33a5a73cd846c0bbf6a507aa4e658c74815eb1d7 Mon Sep 17 00:00:00 2001
-From: Rainer Keller <Rainer.Keller@qt.io>
-Date: Wed, 4 May 2016 12:49:40 +0200
-Subject: [PATCH] Add recovery support
-
----
- include/configs/nitrogen6x.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
-index bbc613d..9c939e6 100644
---- a/include/configs/nitrogen6x.h
-+++ b/include/configs/nitrogen6x.h
-@@ -232,6 +232,11 @@
-        "clearenv=if sf probe || sf probe || sf probe 1 ; then " \
-                "sf erase 0xc0000 0x2000 && " \
-                "echo restored environment to factory default ; fi\0" \
-+       "recovery_boot=setenv recovery true ; dtype=mmc ; setenv bootpart 3 ; " \
-+               "for disk in 0 1 ; do " \
-+                       "${dtype} dev ${disk} ; " \
-+                       "load ${dtype} ${disk}:${bootpart} 10008000 /6x_bootscript && source 10008000 ; " \
-+               "done\0" \
-        "bootcmd=for dtype in ${bootdevs}" \
-                "; do " \
-                        "if itest.s \"xusb\" == \"x${dtype}\" ; then " \
-@@ -245,6 +250,8 @@
-                                        "&& source 10008000 ; " \
-                        "done ; " \
-                "done; " \
-+               "echo Startup failed, running recovery ; " \
-+    "run recovery_boot ; " \
-                "setenv stdout serial,vga ; " \
-                "echo ; echo 6x_bootscript not found ; " \
-                "echo ; echo serial console at 115200, 8N1 ; echo ; " \
--- 
-2.7.3
-
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
new file mode 100644
index 0000000..9eda199
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
@@ -0,0 +1,23 @@
+From 59d272d9df5337bb4bd62a96fc16c8e280c49344 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
+
+Increased from 256MB (the default) to 384MB. Without this, HW-accelerated
+video decoding cannot work for high resolution videos.
+---
+ include/configs/nitrogen6x.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
+index 646c505..ddbb4c5 100644
+--- a/include/configs/nitrogen6x.h
++++ b/include/configs/nitrogen6x.h
+@@ -28,6 +28,7 @@
+ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+ #define CONFIG_VIDEO
+ #define BD_I2C_MASK    7
++#define BD_CMA         "384M"
+ 
+ #if defined(CONFIG_SABRELITE)
+ #define CONFIG_ENV_IS_IN_MMC
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
index 5f0d155..013e54b 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
@@ -30,5 +30,5 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
-        file://0002-Add-recovery-support.patch \
+        file://0002-set-CMA-reserved-size-to-384MB.patch \
         "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch
deleted file mode 100644
index d648340..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3bb661da09e2a57ef452d388d69b8d01044136f1 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 13 Jan 2016 09:26:33 +0200
-Subject: [PATCH] set CMA reserved size to 384MB
-
-Increased from 256MB (the default) to 384MB. Without this, HW-accelerated
-video decoding cannot work for high resolution videos.
----
- board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-index 86242b5..da4ea05 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-@@ -92,7 +92,7 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then
-        echo "!!!!!!!!!!!!!!!!"
- fi
- 
--setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc"
-+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M cma=384M consoleblank=0 rootwait fixrtc"
- 
- 
- bpart=2
--- 
-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_git.bbappend
index a01780a..dafcf84 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_git.bbappend
@@ -29,6 +29,5 @@
 
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
-        file://0001-set-CMA-reserved-size-to-384MB.patch \
         file://0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch \
         "
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
index 1997bd5..0c9a2bb 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master"
 
 SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets"
 
-SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306"
+SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde"
 SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264"
 
 SRCREV_FORMAT = "multiscreen_assets"
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index e9f3793..7793d0b 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -3,7 +3,7 @@ Description=Neptune
 After=dbus.service dbus-session.service systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml
 Restart=on-failure
 WorkingDirectory=/opt/neptune
 
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index ceceec8..ba82524 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -41,10 +41,10 @@ SRC_URI += " \
     file://neptune.service \
     "
 
-SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555"
+SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92"
 
-DEPENDS = "qtbase qtdeclarative"
-RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
+DEPENDS = "qtbase qtdeclarative qttools-native"
+RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \
                   qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index e3dd3fd..b471a89 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "a15c13d6255d23ce90997913b7c1347fef396fa8"
+SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb
index 9ed6991..57eae88 100644
--- a/recipes-qt/qt5-addons/qtglesstream.bb
+++ b/recipes-qt/qt5-addons/qtglesstream.bb
@@ -38,7 +38,7 @@ SRC_URI = " \
     "
 
 PV = "1.0.0"
-SRCREV = "2a58387d9ca27ba528d5d2ab5db6c9e5a2f8a1de"
+SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2"
 BRANCH = "dev"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
index 9f6fdc3..43e1685 100644
--- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
+++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri
@@ -3,3 +3,4 @@ QMAKE_LIBS_OPENGL_ES2  = -lQtGlesStreamClient
 
 QMAKE_PLATFORM         += boot2qt
 QT_QPA_DEFAULT_PLATFORM = eglfs
+EGLFS_DEVICE_INTEGRATION = none
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb
index 1c91236..e5d7cb8 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -43,6 +43,6 @@ SRC_URI = " \
     git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \
     "
 
-SRCREV = "4f54d9b10ebdd296accfa5526d7c941a03249a50"
+SRCREV = "314de829065a3fa411b8fed90ff1289b000e229b"
 
 DEPENDS = "qtbase qtdeclarative qtconnectivity"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 63f0f6a..23fbaf8 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
     git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
     "
 
-SRCREV = "8df367f3a7356337dba25666c52e73e3b0480df3"
+SRCREV = "86d362f4ed6baeab0dfc6d892f18458a65ec7361"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index cc25bd4..9f43fff 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -47,8 +47,8 @@ RDEPENDS_${PN} = "\
     "
 
 RDEPENDS_${PN}_append_linux = "\
-    nativesdk-python-modules \
-    nativesdk-python-misc \
+    nativesdk-python3-modules \
+    nativesdk-python3-misc \
     nativesdk-perl-modules \
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 27d5714..1050fb9 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -16,7 +16,7 @@
 
   <project name="poky"
            remote="yocto"
-           revision="6a1f33cc40bfac33cf030fe41e1a8efd1e5fad6f"
+           revision="b0f3c0fb99d15b5914ac876b62ff16b3e11d0b80"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
@@ -24,7 +24,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="9b12e74031f12c6ced4d69ee0a0780113501ee18"
+           revision="95f123a60a97428237164f96672b0c11c539efed"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
@@ -33,7 +33,7 @@
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="ec54f623eee97b75b7ad87503477316495c7fc26"
+           revision="fc804d29ee85d58e9bb66f7319e749b53e192457"
            path="sources/meta-freescale"
            groups="notdefault,external,fsl,ti,smx6"/>
   <project name="meta-ti"
@@ -48,7 +48,7 @@
            groups="notdefault,external,rpi"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
-           revision="065228815a7ca5201df1ed4c030b152054a5eda3"
+           revision="a78b17c24e66567f272ad47f9d6300e6b1b90c29"
            path="sources/meta-freescale-3rdparty"
            groups="notdefault,external,fsl,smx6"/>
   <project name="meta-intel"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index a556e4f..f29832d 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
+    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)