56 files changed, 240 insertions, 68 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 469042c..87d05f4 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -106,7 +106,7 @@ get_groups() {
    all)
      PROJECT_GROUPS="external"
    ;;
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
      PROJECT_GROUPS="toradex"
    ;;
    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass
index 435bb1a..b12f371 100644
--- a/classes/sdk-sources.bbclass
+++ b/classes/sdk-sources.bbclass
@@ -52,6 +52,7 @@ python do_fetch () {
 }
 python do_unpack () {
+    sdk_uds = [];
    src_uri = (d.getVar('SRC_URI', True) or "").split()
    if len(src_uri) == 0:
        return
@@ -64,17 +65,18 @@ python do_unpack () {
        for url in uris:
            ud = list(bb.fetch2.decodeurl(url))
            if ("sdk-uri" in ud[5]):
-                unpack_local_uri(ud, d)
+                sdk_uds.append(ud)
                src_uri.remove(url)
-    if len(src_uri) == 0:
+    if len(src_uri) != 0:
-        return
+        try:
+            fetcher = bb.fetch2.Fetch(src_uri, d)
+            fetcher.unpack(rootdir)
+        except bb.fetch2.BBFetchException as e:
+            raise bb.build.FuncFailed(e)
-    try:
+    for ud in sdk_uds:
-        fetcher = bb.fetch2.Fetch(src_uri, d)
+        unpack_local_uri(ud, d)
-        fetcher.unpack(rootdir)
-    except bb.fetch2.BBFetchException as e:
-        raise bb.build.FuncFailed(e)
 }
 def unpack_local_uri(ud, d):
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
new file mode 100644
index 0000000..722da17
--- /dev/null
+++ b/conf/distro/include/colibri-imx7.conf
@@ -0,0 +1,42 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+include conf/distro/include/toradex.inc
+DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
+IMAGE_FSTYPES += "ext3 sdcard"
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \
+    ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
+BOOT_SCRIPTS += " \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    flash_mmc-${MACHINE}.img:flash_mmc.img \
+    flash_blk-${MACHINE}.img:flash_blk.img \
+    "
+DISTRO_FEATURES_remove = "webengine"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index d39dffb..e1c5d55 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -29,6 +29,8 @@
 include conf/distro/include/toradex.inc
+BBMASK .= "|meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex|meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb|meta-fsl-arm-extra/recipes-bsp/mqxboot"
 DEPLOY_CONF_NAME = "Toradex Colibri VF"
 IMAGE_FSTYPES += "ext3 sdcard"
@@ -57,7 +59,6 @@ DISTRO_FEATURES_remove = "webengine"
 MACHINE_EXTRA_INSTALL = "\
        opengldummy \
-        mqxboot \
        "
 MACHINE_EXTRA_INSTALL_SDK = "\
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 95a2352..9408c73 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -28,4 +28,4 @@
 ############################################################################
 BBMASK ?= " "
-BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit"
+BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
index c2e2fc6..77ce484 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -27,12 +27,6 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \
-        "
 do_configure_prepend () {
    # FunctionFS for adb
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
index 5352ed7..5352ed7 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
index 420cfe0..bb209ad 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
@@ -73,4 +73,4 @@ do_install[noexec] = "1"
 do_populate_sysroot[noexec] = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6)"
+COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)"
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
new file mode 100644
index 0000000..3e05a85
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
@@ -0,0 +1,6 @@
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 0
+setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
+setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}'
+echo 'enter "run update_uboot" to update the uboot'
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
new file mode 100644
index 0000000..0c16652
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
@@ -0,0 +1,6 @@
+#flash_mmc has been renamed to flash_blk, ensure compatibility when updating from older versions
+test -n ${interface} || setenv interface mmc
+test -n ${drive} || setenv drive 0
+fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img
+source ${loadaddr}
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
index b7c7d63..b7c7d63 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
index 0743128..0743128 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
new file mode 100644
index 0000000..501ad33
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
@@ -0,0 +1,12 @@
+diff -Naur git.orig/include/configs/colibri_imx7.h git/include/configs/colibri_imx7.h
+--- git.orig/include/configs/colibri_imx7.h     2016-07-15 12:31:35.915934824 +0300
+++ git/include/configs/colibri_imx7.h  2016-07-15 12:32:40.867937388 +0300
+@@ -248,7 +248,7 @@
+                "${board}/flash_eth.img && source ${loadaddr}\0" \
+        "setsdupdate=mmc rescan && setenv interface mmc && " \
+                "fatload ${interface} 0:1 ${loadaddr} " \
+-               "${board}/flash_blk.img && source ${loadaddr}\0" \
+               "/flash_blk.img && source ${loadaddr}\0" \
+        "setup=setenv setupargs " \
+                "console=tty1 console=${console}" \
+                ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
new file mode 100644
index 0000000..25476dd
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
@@ -0,0 +1,14 @@
+diff -Naur git.orig/include/configs/colibri_vf.h git/include/configs/colibri_vf.h
+--- git.orig/include/configs/colibri_vf.h       2016-07-15 12:05:41.263873456 +0300
+++ git/include/configs/colibri_vf.h    2016-07-15 12:06:19.759874976 +0300
+@@ -161,8 +161,8 @@
+        "sdargs=root=/dev/mmcblk0p2 rw rootwait\0"      \
+        "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
+        "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
+-       "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
+-       "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
+       "load mmc 0:1 ${kernel_addr_r} /${kernel_file} && " \
+       "load mmc 0:1 ${fdt_addr_r} /${soc}-colibri-${fdt_board}.dtb && " \
+        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ 
+ #define NFS_BOOTCMD \
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
index ccdb1dd..bdae0b8 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
@@ -30,4 +30,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
        file://0001-colibri-vf-remove-console-from-tty1.patch \
+        file://0002-colibri-vf-fix-mmc-boot.patch \
+        file://0001-colibri-imx7-fix-update-u-boot.patch \
        "
+do_compile_append () {
+  if [ "${MACHINE}" = "colibri-vf" ]; then
+    oe_runmake u-boot-nand.imx
+  fi
+}
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
index 45b5fd3..45b5fd3 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index 624fc71..06fe24a 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -8,15 +8,15 @@ inherit cmake_qt5
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
-BRANCH = "2.4"
+BRANCH = "master"
-SRCREV = "4cf2c07d9ab6af3f4e0a869749ced1a9d8c86e8e"
+SRCREV = "4e8ff158816f07ced45a2cc71cf4176b7c0656d2"
-PV = "2.4.1+git${SRCPV}"
+PV = "master+git${SRCPV}"
-DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity"
+DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d"
 S = "${WORKDIR}/git"
-EXTRA_OECMAKE += " -DGAMMARAY_BUILD_UI=OFF"
+EXTRA_OECMAKE += " -DGAMMARAY_BUILD_UI=OFF -DGAMMARAY_CORE_ONLY_LAUNCHER=ON"
 FILES_${PN}-dev += " \
    /usr/lib/cmake/* \
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 40395ce..70f213b 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -34,11 +34,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 inherit qt5-module sdk-sources systemd
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=http \
    file://neptune.service \
    "
-SRCREV = "5390df2602f9134175383c55031aa8786421d6f4"
+SRCREV = "3d36a7b8e53770c91db60cec9586ef572a2f2814"
 BRANCH = "master"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/automotive/qmllive-target/qmllive-target.patch b/recipes-qt/automotive/qmllive-target/qmllive-target.patch
new file mode 100644
index 0000000..e3f81fa
--- /dev/null
+++ b/recipes-qt/automotive/qmllive-target/qmllive-target.patch
@@ -0,0 +1,19 @@
+diff --git a/runtime.pro b/runtime.pro
+index 73dd6d7..e569b23 100644
+--- a/runtime.pro
+++ b/runtime.pro
+@@ -1,5 +1,4 @@
+ TARGET = qmlliveruntime
+-DESTDIR = ../../bin
+ 
+ QT *= widgets quick
+ osx: CONFIG -= app_bundle
+@@ -14,6 +13,6 @@ include(../src.pri)
+ RESOURCES += \
+     qml.qrc
+ 
+-
+-
+target.path += /usr/bin
+INSTALLS += target
+ 
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
new file mode 100644
index 0000000..efcac4d
--- /dev/null
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "QML Live target runtime"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
+inherit qmake5 sdk-sources
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI = " \
+    git://codereview.qt-project.org/qt-apps/qmllive.git;branch=${BRANCH};protocol=ssh;name=tools \
+    file://qmllive-target.patch \
+"
+BRANCH = "master"
+SRCREV_tools="d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
+S = "${WORKDIR}/git/src/runtime"
+DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 2595168..fd128bd 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \
    "
-SRCREV = "b22d2dfda8dda9c42b1ee5729dd8af37a883cabf"
+SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76"
 BRANCH = "5.7"
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 43f1b5e..b50defc 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -41,7 +41,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \
    "
-SRCREV = "b850b82e70e9585097ceb2812002bb4a7ddba06f"
+SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a"
 BRANCH = "5.7"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index fb623f7..3034760 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 inherit qmake5 sdk-sources
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/qtwebbrowser \
+    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser;branch=${BRANCH};protocol=http;sdk-uri=5.7/Src/qtwebbrowser \
    "
 SRCREV = "023733af5523a5ad84359926224fa106001215f4"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
new file mode 100644
index 0000000..1056ea0
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
@@ -0,0 +1,9 @@
+env=FB_MULTI_BUFFER=2
+env=QT_QPA_EGLFS_FORCEVSYNC=1
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
+env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
+env=QT_QUICK_CONTROLS_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
+base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index f6a02b0..bd0b9f7 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -34,10 +34,10 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
 inherit qmake5 sdk-sources
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=ssh;name=demos \
+    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http;name=demos \
    ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
    ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
-    git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
+    git://codereview.qt-project.org/qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=http;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
    "
@@ -47,7 +47,7 @@ PV = "5.7+git${SRCPV}"
 BRANCH = "5.7"
 BROWSER_BRANCH = "dev"
 QT_BRANCH = "5.7"
-SRCREV_demos = "a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e"
+SRCREV_demos = "cd9f0c40f30226c7ce1c3259aea8ebca08acfbb8"
 SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a"
 SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1"
 SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 918943c..d5ff015 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qmake5
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=http \
    file://b2qt-startup.sh \
    file://qtlauncher.service \
    file://b2qt.service \
diff --git a/recipes-qt/b2qt-addons/b2qt-ota.bb b/recipes-qt/b2qt-addons/b2qt-ota.bb
index 9c5929c..5b00b48 100644
--- a/recipes-qt/b2qt-addons/b2qt-ota.bb
+++ b/recipes-qt/b2qt-addons/b2qt-ota.bb
@@ -29,7 +29,7 @@ LIC_FILES_CHKSUM = "file://src/lib/qotaclient.h;md5=da66cc6e520f8151501c0f6c1148
 inherit qt5-module
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/ota;branch=${BRANCH};protocol=ssh \
+    git://codereview.qt-project.org/qt/qtotaupdate;branch=${BRANCH};protocol=http \
    "
 SRCREV = "d8d81530692454e4e38f682f6a09049d27b8c1ad"
@@ -38,6 +38,5 @@ PV = "git${SRCPV}"
 S = "${WORKDIR}/git"
-DEPENDS = "qtbase qtdeclarative"
+DEPENDS = "qtbase qtdeclarative ostree"
-RDEPENDS_${PN} = "ostree"
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
index 73019b3..7579777 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-utils \
    "
-SRCREV = "dee9f0867ad66cb3a9848f2391ba450aa6f65f25"
+SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c"
 BRANCH = "5.7"
 PV = "5.7+git${SRCPV}"
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 6cd3a6c..a12e83b 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -28,16 +28,16 @@
 ############################################################################
 DESCRIPTION = "Boot to Qt Wayland Demo Compositor"
-LICENSE = "The-Qt-Company-DCLA-2.1"
+LICENSE = "BSD | The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://main.cpp;md5=9fab217254862959183461343b99a1ab;beginline=1;endline=39"
+LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49"
-inherit qmake5 sdk-sources
+inherit qmake5
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=http \
    "
-SRCREV = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c"
+SRCREV = "a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e"
 BRANCH = "5.7"
 PV = "5.7+git${SRCPV}"
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index aee96d9..5ec66b4 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -43,4 +43,5 @@ RDEPENDS_${PN} += " \
    neptune-ui-apps \
    ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
    gammaray \
+    qmllive-target \
    "
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 41e5765..bcc33d6 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -33,4 +33,4 @@ SRC_URI_append_class-target = " \
    file://0001-Remove-qgltf.patch \
    "
-SRCREV = "a398469e66e3a953097857c60655c41bf291a06b"
+SRCREV = "eb3fed53f75abd15203d4c749e4815a74f1fccb2"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 1af902e..855bb03 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-SRCREV = "5c2ff22ba117f295718c529198ab42ee4646d90c"
+SRCREV = "6c1e352803a6efbd8b14e5296434e22165b65084"
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 88a1563..8f0a9e5 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -53,7 +53,7 @@ do_configure_prepend() {
    install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
-SRCREV = "5c2ff22ba117f295718c529198ab42ee4646d90c"
+SRCREV = "6c1e352803a6efbd8b14e5296434e22165b65084"
 # Temporarily here, until merged upstream
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 75253d0..e87f901 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "607b82287c70a2db4d35ee5ab0bef89117468b2b"
+SRCREV = "5f4845dbaa6f5fc59ffc3b7418f846aefc191c17"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index b208484..1439fbc 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
-SRCREV = "23a207fb56bf21aeb598ddd914159333f28f8a00"
+SRCREV = "344583c3994048fbc7757c4e2abb647329eadbf3"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend
index f468494..1fbf9e4 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bbappend
+++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "57832c490a6f34f6ede7caa864dde20abda94358"
+SRCREV = "643a6ad1872e87a3a54e12cca8b365475f0d1eb3"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index e1f3425..9827013 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "2d70b4b5c38263e866d9b317a576c952d3501874"
+SRCREV = "210617de78c78af44efdc251ba7a207c5c26e11c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index 06a800f..c303d3d 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "f38c435b37f7ec1dae4718da9929a9727af5e592"
+SRCREV = "55c13afa512bf5deaf1481917eb5902880a23e32"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 9701623..3678923 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "9cbca0266d7482a7d3d198acfa9f3a2661d435f3"
+SRCREV = "627666095ff5d4767cdb6803f677798b0a1aaa31"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index d7ca95d..3a62808 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
-SRCREV = "d1b708cde9428928b9f5c59c099f2deb584efd5f"
+SRCREV = "f185e71635fda88a69e5edc8e20a4b397fd6f837"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 8f117a1..e36be2a 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)
                  ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
                  ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
-SRCREV = "48086a7573268774fab346d6fde0c9137ba1bf4e"
+SRCREV = "8a2c5887cc7af6b0bb2fef913bc2acca5002cbf0"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index a9c2e4e..e7694cb 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -30,4 +30,4 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
-SRCREV = "7deae40b87e1637d55de8d111e99f4da1d5584d4"
+SRCREV = "ea21a76606259eca44e2b4f7d42c2127950c2987"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 5456d06..7a41877 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "0a6313018cbd4c78b1e959236bd96c62d5d59c1c"
+SRCREV = "9b19e9ce6cb3ed753fee3a659534398d730fb629"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 5d6143f..7718efb 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -27,6 +27,6 @@
 ##
 ############################################################################
-SRCREV = "b231d9f41903f8514a2d91844f4515055307af3a"
+SRCREV = "d39db072e40263314f505cdaa10e17f7358b9392"
 SRC_URI_remove = "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 730635a..2f9a759 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "5716e18a8f63593e8e64fce0b44d714fddfe7298"
+SRCREV = "4c1d5c04162752fc6aea40e80a8b5e423b2a43eb"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index 64321b9..0fb704d 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -29,7 +29,7 @@
 inherit qtquickcompiler
-SRCREV = "fd18b3e7b781680033b8dfed9476b0fc4a06dcc7"
+SRCREV = "5e45faaf050752b18037ea518cd0b6909a9cc3ed"
 # To enabled Nuance T9 Write support, you need to provide the licensed components
 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index ca1a5bb..fc29f51 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "9c714358b6a99e9e1517bdf5495ccda99408d553"
+SRCREV = "e0186e009080e96f30f5e227e0f640c9db648325"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index ca1a5bb..fc29f51 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "9c714358b6a99e9e1517bdf5495ccda99408d553"
+SRCREV = "e0186e009080e96f30f5e227e0f640c9db648325"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index e525d81..9f20f27 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "18d8ca185819d6d81a9f21858ff2d60bf6fd05f8"
+SRCREV = "23cd16ad672a3d07da00d14276a63901d8d9f118"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 326c286..c5ae88f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \
    file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
    "
-SRCREV_qtwebengine = "96df24618fbbc0e06a24e93b7e9aefb0f923f4af"
+SRCREV_qtwebengine = "a833bc8e4e2a2545c8920c329b084a9373c261c5"
 SRCREV_chromium = "168cc2b83c53e4e68bf89b331d92da88a99d2bf3"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 66aba75..3816f2f 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "cd80c041220df2875297622a0012933412730e9d"
+SRCREV = "e7ba0d8e24828f7c0e44adc5db39bfd675094094"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index b326e48..88338dc 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "4ca909e7daef701882755487008c9e4f0b978dbc"
+SRCREV = "8fdcecab85b9f89b288456f16f6b729f6fff2372"
diff --git a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
new file mode 100644
index 0000000..ed58b50
--- /dev/null
+++ b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
@@ -0,0 +1,27 @@
+From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Tue, 21 Jun 2016 15:26:47 +0200
+Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
+ mounts too"
+This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/core/mount.c b/src/core/mount.c
+index fda4d65..3944232 100644
+--- a/src/core/mount.c
+++ b/src/core/mount.c
+@@ -337,7 +337,7 @@ static int mount_add_device_links(Mount *m) {
+ 
+         assert(m);
+ 
+-        p = get_mount_parameters(m);
+        p = get_mount_parameters_fragment(m);
+         if (!p)
+                 return 0;
+ 
+-- 
+2.7.4
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend
index 5594a3d..0877135 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/recipes/systemd/systemd_%.bbappend
@@ -27,7 +27,18 @@
 ##
 ############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"
 do_install_append() {
    # remove login from tty1
    rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
 }
+do_verify_patch_required() {
+    if [ -n "$(cat ${S}/NEWS | grep "CHANGES WITH 229")" ]; then
+        bbwarn "systemd: The 0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch patch is not required anymore."
+    fi
+}
+addtask do_verify_patch_required after do_fetch before do_configure
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index bb86dd7..9d6effc 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -30,11 +30,11 @@
  <project name="meta-mingw"
           remote="qtyocto"
           path="sources/meta-mingw"
-           revision="2844575c17f3875aa2ad0e83d600f52a1893390d"/>
+           revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
  <project name="meta-fsl-arm"
           remote="yocto"
-           revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
+           revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
           path="sources/meta-fsl-arm"
           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
  <project name="meta-ti"
@@ -49,7 +49,7 @@
           groups="notdefault,external,rpi"/>
  <project name="meta-fsl-arm-extra"
           remote="freescale"
-           revision="8fdde39f732be9e1ee9505a04c579073114459e7"
+           revision="dd074c47af53948041f6c5671e519fbf815b0980"
           path="sources/meta-fsl-arm-extra"
           groups="notdefault,external,fsl,toradex,architech,smx6"/>
  <project name="meta-beagleboard"
@@ -59,7 +59,7 @@
           groups="notdefault,external,bbb"/>
  <project name="meta-toradex"
           remote="toradex"
-           revision="eca5937408c75a997b160bd1b92e1496b07421cf"
+           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
           path="sources/meta-toradex"
           groups="notdefault,external,toradex"/>
  <project name="meta-tibidabo"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index f370032..5ee1ad0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -56,7 +56,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
  case ${MACHINE} in
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
      LAYERSCONF="bblayers.conf.toradex.sample"
    ;;
    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)