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

2 files changed, 5 insertions, 5 deletions

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)