84 files changed, 1241 insertions, 203 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 0ae2503..ef2e024 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -95,9 +95,12 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i)
+    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
       PROJECT_GROUPS="fsl"
     ;;
+    smarc-samx6i)
+      PROJECT_GROUPS="smx6"
+    ;;
     tibidabo)
       PROJECT_GROUPS="architech"
     ;;
diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass
new file mode 100644
index 0000000..4d193b7
--- /dev/null
+++ b/classes/image_dd.bbclass
@@ -0,0 +1,78 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# This class is based on meta-fsl-arm/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="${DEPLOY_DIR_IMAGE}/${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="${DEPLOY_DIR_IMAGE}/${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 }')
+    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 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img
+}
+
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index a61d625..cce6669 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -23,7 +23,8 @@ inherit populate_sdk
 
 replace_sysroot_symlink() {
         SYMLINK_SYSROOT=$1
-        for SOURCE in `find ${SYMLINK_SYSROOT} -type l`
+        SEARCH_FOLDER=$2
+        for SOURCE in `find ${SEARCH_FOLDER} -type l`
         do
                 TARGET=`readlink -m "${SOURCE}"`
                 #check whether TARGET is inside the sysroot when not prepend the sysroot
@@ -31,6 +32,7 @@ replace_sysroot_symlink() {
                 rm "${SOURCE}"
                 if [ -d "${TARGET}" ]; then
                         cp -r "${TARGET}" "${SOURCE}"
+                        replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE}
                 elif [ -f "${TARGET}" ]; then
                         cp "${TARGET}" "${SOURCE}"
                 elif [ -e "${TARGET}" ]; then
@@ -40,8 +42,8 @@ replace_sysroot_symlink() {
 }
 
 fakeroot tar_sdk_sdkmingw32() {
-        replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT}
-        replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE}
+        replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT}
+        replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} ${SDK_OUTPUT}${SDKPATHNATIVE}
         # Package it up
         mkdir -p ${SDK_DEPLOY}
         cd ${SDK_OUTPUT}/${SDKPATH}
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass
index 16fb6fe..b6710be 100644
--- a/classes/qtquickcompiler.bbclass
+++ b/classes/qtquickcompiler.bbclass
@@ -20,16 +20,23 @@
 ##############################################################################
 
 python __anonymous() {
+    provider = "qtquickcompiler"
+
     sdk_path = d.getVar('QT_SDK_PATH', True) or ""
     if len(sdk_path) != 0:
-        bb.note("TODO: QtQuickCompiler not yet available for external builds")
-    else:
-        pn = d.getVar("PN", True)
-        if "toolchain-host" in pn:
-            d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools")
-        if "toolchain-target" in pn:
-            d.appendVar('RDEPENDS_' + pn, " qtquickcompiler-dev")
+        qtquickcompiler_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk"
+        if not os.path.isdir(qtquickcompiler_path):
+            bb.note("QtQuickCompiler not available")
+            return
         else:
-            d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native")
-            d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
+            provider = "qtquickcompiler-sdk"
+
+    pn = d.getVar("PN", True)
+    if "toolchain-host" in pn:
+        d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider)
+    if "toolchain-target" in pn:
+        d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider)
+    else:
+        d.appendVar('DEPENDS', " %s %s-native" % (provider, provider))
+        d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend")
 }
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 6b12ac5..3be5ea3 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -37,6 +37,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
   ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
new file mode 100644
index 0000000..f604394
--- /dev/null
+++ b/conf/bblayers.conf.smx6.sample
@@ -0,0 +1,50 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-fsl-arm \
+  ${BSPDIR}/sources/meta-fsl-arm-extra \
+  ${BSPDIR}/sources/meta-smx6 \
+  ${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-ruby \
+  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  "
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index af7fcb3..7b56113 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -61,6 +61,10 @@ MACHINE_EXTRA_INSTALL ?= ""
 MACHINE_EXTRA_INSTALL_SDK ?= ""
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 
+# Override mkspec for mingw build
+OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
+OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
+
 PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 
 IMAGE_FSTYPES = "tar.gz conf"
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 9938003..d5827db 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -37,6 +37,11 @@ BOOTFS_CONTENT = "\
     flash_blk-${MACHINE}.img:flash_blk.img \
     "
 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 \
+    "
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 6d1a2d5..4c9a923 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -32,7 +32,12 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
     u-boot-${MACHINE}.imx:u-boot.imx \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
+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 \
+    "
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index f71d118..0d31f99 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -26,13 +26,18 @@ DEPLOY_CONF_NAME = "Toradex Colibri VF"
 IMAGE_FSTYPES += "ext3 sdcard"
 
 BOOTFS_CONTENT = "\
-    u-boot-nand.imx:u-boot-nand.imx \
+    u-boot-${MACHINE}.imx:u-boot.imx \
     flash_mmc-${MACHINE}.img:flash_mmc.img \
     flash_blk-${MACHINE}.img:flash_blk.img \
     ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \
     ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \
     "
 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 \
+    "
 
 DEFAULTTUNE = "armv7ahf-neon"
 
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf
index fe04572..8a41388 100644
--- a/conf/distro/include/nuc.conf
+++ b/conf/distro/include/nuc.conf
@@ -25,13 +25,17 @@ DISTRO_FEATURES_DEFAULT += "wayland weston"
 
 DISTRO_FEATURES_remove = "usbgadget"
 
-IMAGE_FSTYPES += " hddimg"
+IMAGE_CLASSES += "image_dd_efi"
+IMAGE_FSTYPES += "ext3 dd"
+
+INITRAMFS_IMAGE = "initramfs-basic"
 
 SYSVINIT_ENABLED_GETTYS = "1"
 
 MACHINE_EXTRA_INSTALL = "\
         wayland \
         mesa-megadriver \
+        grub-efi-config \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 7e4c057..040ea9b 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -46,3 +46,7 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
 GPU_MEM = "256"
 # video camera support
 VIDEO_CAMERA = "1"
+RPI_FT5604 = "1"
+
+KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
+MACHINE_FEATURES += "pitft"
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 23bc85f..d3ce2c9 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -45,3 +45,6 @@ MACHINE_EXTRA_INSTALL_SDK += " \
         "
 
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
+
+BBMASK ?= " "
+BBMASK .= "|meta-smx6/recipes-qt"
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 19399c6..6f47970 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -31,6 +31,12 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "tibidabo-bootscript-sd:do_deploy virtual/kernel:do_deploy"
 
+# mx6 GPU libraries
+PREFERRED_PROVIDER_virtual/egl_mx6 = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 7aa0dc8..0fdcdb7 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -102,7 +102,7 @@ DL_DIR ?= "${TOPDIR}/../downloads"
 #
 # The default is a sstate-cache directory under TOPDIR.
 #
-#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+SSTATE_DIR ?= "${TOPDIR}/../sstate-cache"
 
 #
 # Where to place the build output
@@ -252,7 +252,7 @@ BB_DISKMON_DIRS = "\
 #SSTATE_MIRRORS ?= "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
-SSTATE_MIRRORS ?= "file://.* http://yocto-cache.ci.local/sstate-cache/PATH"
+SSTATE_MIRRORS ?= "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH"
 
 PREMIRRORS = "\
 ftp://.*/.*   http://yocto-cache.ci.local/sources/ \n \
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
new file mode 100644
index 0000000..0f39891
--- /dev/null
+++ b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -0,0 +1,22 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+PACKAGECONFIG_remove = "gles2"
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend
new file mode 100644
index 0000000..df90624
--- /dev/null
+++ b/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.11.1.bbappend
@@ -0,0 +1,22 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+DEPENDS_remove = "imx-gpu-viv"
diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
index 8a2fd54..69adc4f 100644
--- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
+++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
@@ -24,15 +24,35 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
 RDEPENDS_kernel-base = ""
 
 do_configure_prepend() {
-    # FunctionFS for adb
-    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
+
+cat <<EOF >> ${WORKDIR}/defconfig
+
+# FunctionFS for adb
+CONFIG_USB_FUNCTIONFS=m
+
+# Enable USB serial support
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_ACM=m
+
+# Control group support
+CONFIG_CGROUPS=y
+
+# Open by fhandle syscalls
+CONFIG_FHANDLE=y
+CONFIG_EXPORTFS=y
+
+# Namespaces support
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+
+EOF
 }
 
 # bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index bf2a850..a945ea8 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -31,3 +31,10 @@ SRC_URI += "\
 INSANE_SKIP_${PN} = "installed-vs-shipped"
 KERNEL_IMAGETYPE = "zImage"
 B = "${S}"
+
+do_configure_prepend() {
+    sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
+        -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
+        -i ${WORKDIR}/defconfig
+    echo "CONFIG_FHANDLE=y"  >> ${WORKDIR}/defconfig
+}
diff --git a/meta-nuc-extras/classes/image_dd_efi.bbclass b/meta-nuc-extras/classes/image_dd_efi.bbclass
new file mode 100644
index 0000000..7bbff62
--- /dev/null
+++ b/meta-nuc-extras/classes/image_dd_efi.bbclass
@@ -0,0 +1,45 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+DESCRIPTION = "Extends image_dd class to boot via GRUB-EFI and initramfs."
+LICENSE = "CLOSED"
+
+inherit image_dd
+
+EXTRA_IMAGECMD_ext3 += "-L rootfs"
+IMAGE_DEPENDS_ext3 += "initramfs-basic:do_rootfs"
+
+IMAGE_CMD_ext3_prepend() {
+
+    # 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 > ${IMAGE_ROOTFS}/boot/initramfs
+    chmod 0644 ${IMAGE_ROOTFS}/boot/initramfs
+}
+
+do_populate_boot() {
+
+    mkdir -p ${WORKDIR}/EFI/BOOT/
+    # Path where EFI firmware searches for EFI executable
+    cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+    mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
+}
+
diff --git a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg b/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg
new file mode 100644
index 0000000..ca53537
--- /dev/null
+++ b/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg
@@ -0,0 +1,10 @@
+# Created by meta-b2qt
+serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+default=boot
+timeout=10
+
+menuentry 'boot' {
+    linux /boot/bzImage root=LABEL=rootfs
+    initrd /boot/initramfs
+}
+
diff --git a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend
new file mode 100644
index 0000000..d002240
--- /dev/null
+++ b/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -0,0 +1,40 @@
+##############################################################################
+##
+## 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}/${PN}:"
+SRC_URI += "file://grub.cfg"
+
+do_deploy_prepend() {
+
+cat > ${WORKDIR}/cfg <<EOF
+search.file /boot/grub2/grub.cfg root
+set prefix=/boot/grub2
+EOF
+}
+
+do_install_append() {
+
+    install -d ${D}/boot/grub2/
+    install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
+}
+
+PACKAGES += "${PN}-config"
+FILES_${PN}-config = "/boot/grub2/"
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
new file mode 100644
index 0000000..641e0f6
--- /dev/null
+++ b/meta-raspberrypi-extras/conf/layer.conf
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_rpi"
+BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_rpi = "20"
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
new file mode 100644
index 0000000..b711ab5
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
@@ -0,0 +1,27 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+do_deploy_append() {
+    if [ "${RPI_FT5604}" = "1" ]; then
+        echo "# Enable rpi-ft5604 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
+}
diff --git a/meta-smx6-extras/conf/layer.conf b/meta-smx6-extras/conf/layer.conf
new file mode 100644
index 0000000..097fefe
--- /dev/null
+++ b/meta-smx6-extras/conf/layer.conf
@@ -0,0 +1,37 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_smx6"
+BBFILE_PATTERN_b2qt_smx6 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_smx6 = "20"
+
+# meta-smx6 depends on fsl-demos, but that's not needed
+LAYERDEPENDS_smx6 = ""
+# meta-smx6 layer.conf modifies qtbase PACKAGECONFIG
+PACKAGECONFIG_remove_pn-qtbase = "examples"
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
new file mode 100644
index 0000000..00f3c11
--- /dev/null
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -0,0 +1,26 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+do_configure_prepend() {
+    echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
+    echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
+    echo "CONFIG_CGROUPS=y"                 >> ${WORKDIR}/defconfig
+}
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 3d63f6b..337d57d 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
@@ -29,6 +29,8 @@ SRC_URI = " \
     file://flash_blk.scr \
     "
 
+S = "${WORKDIR}"
+
 inherit deploy
 
 do_mkimage () {
@@ -62,4 +64,4 @@ do_install[noexec] = "1"
 do_populate_sysroot[noexec] = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf)"
+COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6)"
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
index 5e31380..be8ec8d 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
@@ -1,2 +1,2 @@
-setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot'
+setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot'
 echo 'enter "run update_uboot" to update the uboot'
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-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch
new file mode 100644
index 0000000..0743128
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch
@@ -0,0 +1,36 @@
+From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 24 Feb 2016 15:39:52 +0200
+Subject: [PATCH] colibri imx6: enable sdboot by default
+
+remove console from tty1
+---
+ include/configs/colibri_imx6.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
+index c545334..eb0dfa9 100644
+--- a/include/configs/colibri_imx6.h
++++ b/include/configs/colibri_imx6.h
+@@ -242,7 +242,8 @@
+ 
+ #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
++       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
++        "run emmcboot ; echo ; echo emmcboot failed ; " \
+                "run nfsboot ; echo ; echo nfsboot failed ; " \
+                "usb start ;" \
+                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+@@ -261,7 +262,7 @@
+        "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
+                "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\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 " \
+        "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
+                " source ${kernel_addr_r}\0" \
+-- 
+1.9.1
+
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch
deleted file mode 100644
index bae71d5..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 878f506e43f40c2667e9e5ae82741d32fc653cac Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Thu, 28 May 2015 09:06:54 +0300
-Subject: [PATCH] colibri vf: enable sdboot by default
-
-Run sdboot first and remove console message from tty1
----
- include/configs/colibri_vf.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index 06caabd..fb9fe41 100644
---- a/include/configs/colibri_vf.h
-+++ b/include/configs/colibri_vf.h
-@@ -174,7 +174,7 @@
-        "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-        "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- 
--#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
-+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot"
- 
- #define DFU_ALT_NAND_INFO      "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
- 
-@@ -187,7 +187,7 @@
-        "defargs=\0" \
-        "console=ttyLP0\0" \
-        "setup=setenv setupargs " \
--               "console=tty1 console=${console}" \
-+               "console=${console}" \
-                ",${baudrate}n8 ${memargs} consoleblank=0\0" \
-        "setsdupdate=mmc rescan && setenv interface mmc && " \
-                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
--- 
-1.9.1
-
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-fsl_git.bbappend
index 905619a..1165713 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend
@@ -20,9 +20,7 @@
 ##############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_apalis-imx6 = " \
+SRC_URI += " \
         file://0001-Update-default-args-for-apalis-imx6.patch \
-        "
-SRC_URI_append_colibri-vf = " \
-        file://0001-colibri-vf-enable-sdboot-by-default.patch \
+        file://0001-colibri-imx6-enable-sdboot-by-default.patch \
         "
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
new file mode 100644
index 0000000..b54a4ae
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
@@ -0,0 +1,25 @@
+From f480a948551b0e5592d93cb7a5dc1653de900909 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 24 Feb 2016 16:01:33 +0200
+Subject: [PATCH] colibri vf: remove console from tty1
+
+---
+ include/configs/colibri_vf.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
+index b870812..0726fc5 100644
+--- a/include/configs/colibri_vf.h
++++ b/include/configs/colibri_vf.h
+@@ -202,7 +202,7 @@
+                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
+                "source ${loadaddr}\0" \
+        "setup=setenv setupargs " \
+-               "console=tty1 console=${console}" \
++               "console=${console}" \
+                ",${baudrate}n8 ${memargs} consoleblank=0\0" \
+        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
+        "setusbupdate=usb start && setenv interface usb && " \
+-- 
+1.9.1
+
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
new file mode 100644
index 0000000..4e0c623
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
@@ -0,0 +1,25 @@
+##############################################################################
+##
+## 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}/${PN}:"
+SRC_URI += " \
+        file://0001-colibri-vf-remove-console-from-tty1.patch \
+        "
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index ebf585d..b083a4f 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -30,8 +30,9 @@ SRC_URI = " \
     file://appcontroller.conf \
     "
 
-SRCREV = "af3ab8ec0213a40d90f3d58a8a65a944b0cd753e"
+SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 9270a0f..55b7f98 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -34,12 +34,12 @@ SRC_URI = " \
     https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
     "
 
-PV = "1.0+git${SRCPV}"
+PV = "5.6+git${SRCPV}"
 
 BRANCH = "5.6"
 BROWSER_BRANCH = "dev"
 QT_BRANCH = "5.6"
-SRCREV_demos = "d9d77da89ac7fea96fae940b74c0dfc2225d0b52"
+SRCREV_demos = "1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033"
 SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
 SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
 SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc"
@@ -59,14 +59,14 @@ do_install_append() {
     # we only need plugins from the demos
     rm -rf ${D}/data/user/camera
     rm -rf ${D}/data/user/sensorexplorer
+    rm -rf ${D}/data/user/qtwebbrowser
 
     # we need all qml and content files
     cp -r ${S}/* ${D}/data/user/qt/
 
     # but none of the source files
     find ${D}/data/user/qt/ \( -name '*.cpp' -or -name '*.h' -or -name '*.pro' \) -delete
-    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/.git
-    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser/mockups
+    rm -rf ${D}/data/user/qt/qtwebbrowser/tqtc-qtwebbrowser
 
     if [ -d ${WORKDIR}/git/images ]; then
         install -d 0755 ${D}/data/images
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index 4b92c52..7f4b083 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -33,6 +33,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git/src/helperlibs/proxy"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index b3e95e4..7b51ece 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -33,6 +33,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
index 7b6f2c0..3b1da08 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -31,6 +31,7 @@ SRC_URI = " \
 
 SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
 BRANCH = "master"
+PV = "1.0+git${SRCPV}"
 
 EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index b73b477..ea85c86 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -32,8 +32,9 @@ SRC_URI = " \
     file://b2qt.service \
     "
 
-SRCREV = "b92077ac6962c9f42f778facbdea4a81affb22c1"
+SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
index 00efce9..f43e450 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -29,8 +29,9 @@ SRC_URI = " \
     git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \
     "
 
-SRCREV = "2b81f8dbc97b446b33fb67e3196a8726ed195008"
+SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index 0d2c3db..314e491 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -26,11 +26,12 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginli
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \
+    git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \
     "
 
 SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c"
 BRANCH = "5.6"
+PV = "5.6+git${SRCPV}"
 
 S = "${WORKDIR}/git/wayland/democompositor/"
 
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 7f0867e..c784787 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -31,5 +31,5 @@ RDEPENDS_${PN} += " \
     b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
-    democompositor \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
     "
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb
index c6c1997..090276b 100644
--- a/recipes-qt/qt5-addons/qtcharts_git.bb
+++ b/recipes-qt/qt5-addons/qtcharts_git.bb
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
-SRCREV = "672ea1cb191f9d386ce32b96102fe638fcae5fba"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
index 155c8f0..a148bdc 100644
--- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5-addons/qtdatavis3d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
index 38de1a5..5162519 100644
--- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
new file mode 100644
index 0000000..04a0b3a
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb
@@ -0,0 +1,58 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+DESCRIPTION = "Qt Quick Compiler using prebuilt binaries from Qt SDK"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+
+inherit allarch qmake5_paths
+
+DEPENDS = "qtbase"
+
+S = "${WORKDIR}"
+
+QT_VERSION = "5.6"
+
+NATIVESDK_BINARY = "qtquickcompiler"
+NATIVESDK_BINARY_mingw32 = "qtquickcompiler.exe"
+
+do_install() {
+    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
+    install -m 0755 ${THISDIR}/qtquickcompiler-sdk/mkspecs/features/qtquickcompiler.prf ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features
+    install -d ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
+    install -m 0644 ${THISDIR}/qtquickcompiler-sdk/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake ${D}${OE_QMAKE_PATH_ARCHDATA}/cmake/Qt5QuickCompiler
+
+    if [ "${PN}" = "qtquickcompiler-sdk-native" ]; then
+        install -d ${D}${OE_QMAKE_PATH_BINS}
+        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/qtquickcompiler ${D}${OE_QMAKE_PATH_BINS}
+    elif [ "${PN}" = "nativesdk-qtquickcompiler-sdk" ]; then
+        install -d ${D}${OE_QMAKE_PATH_BINS}
+        install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS}
+    fi
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+ALLOW_EMPTY_${PN} = "1"
+PACKAGES =+ "${PN}-tools"
+FILES_${PN}-tools = "${OE_QMAKE_PATH_BINS}"
+FILES_${PN}-dev = "${OE_QMAKE_PATH_ARCHDATA}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
index 5639d60..f4bdbcc 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
@@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e
 inherit qt5-module qtquickcompiler
 require recipes-qt/qt5/qt5-git.inc
 
-QT_MODULE_BRANCH = "5.6"
 SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf"
 
 DEPENDS = "qtbase qtdeclarative qtsvg hunspell"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index fd8a462..312f6b2 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -19,9 +19,14 @@
 ##
 ##############################################################################
 
-# Needed by qtxmlpatterns
-EXTRA_QTLIB_append = " Network Sql"
-# Needed by qttools
-EXTRA_QTLIB_append = " Xml"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
+
+SRC_URI += "\
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
+    "
+
+fakeroot do_generate_qt_environment_file_mingw32() {
+}
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index 59b6b33..1818817 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -25,18 +25,5 @@ SRC_URI_append_class-target = " \
     file://0001-Remove-qgltf.patch \
     "
 
-SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
-
-DEPENDS += "qt3d-native"
-
-SRC_URI += " \
-    file://0001-Allow-a-tools-only-build.patch \
-    "
-PACKAGECONFIG ??= ""
-PACKAGECONFIG_class-native ??= "tools-only"
-PACKAGECONFIG_class-nativesdk ??= "tools-only"
-PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
-
-EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
-
-BBCLASSEXTEND += "native nativesdk"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 2a767e9..ee14664 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -19,4 +19,11 @@
 ##
 ##############################################################################
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
+
+SRC_URI += "\
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
+    "
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
new file mode 100644
index 0000000..7ce3a9e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -0,0 +1,180 @@
+From 5363b4d6d1f3c5683267ec3e190b85eca964eef8 Mon Sep 17 00:00:00 2001
+From: David Schulz <david.schulz@theqtcompany.com>
+Date: Fri, 3 Jul 2015 16:06:59 +0200
+Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
+
+Upstream-Status: Inappropriate [embedded specific]
+                 too OE specific, probably cannot be upstreamed
+---
+ mkspecs/win32-g++-oe/qmake.conf      | 109 +++++++++++++++++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h |  42 ++++++++++++++
+ 2 files changed, 151 insertions(+)
+ create mode 100644 mkspecs/win32-g++-oe/qmake.conf
+ create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
+
+diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
+new file mode 100644
+index 0000000..1c8879a
+--- /dev/null
++++ b/mkspecs/win32-g++-oe/qmake.conf
+@@ -0,0 +1,109 @@
++#
++# qmake configuration for win32-g++
++#
++# Written for MinGW / gcc 4.6 or higher
++#
++# Cross compile example for i686-w64-mingw32-g++:
++#   configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
++#
++
++load(device_config)
++
++MAKEFILE_GENERATOR      = MINGW
++QMAKE_PLATFORM          = win32 mingw
++CONFIG                 += debug_and_release debug_and_release_target precompile_header
++DEFINES                += UNICODE
++QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
++
++QMAKE_EXT_OBJ           = .o
++QMAKE_EXT_RES           = _res.o
++
++QMAKE_COMPILER          = $(OE_QMAKE_COMPILER) gcc
++
++QMAKE_CC                = $(OE_QMAKE_CC)
++QMAKE_LEX               = flex
++QMAKE_LEXFLAGS          =
++QMAKE_YACC              = byacc
++QMAKE_YACCFLAGS         = -d
++QMAKE_CFLAGS            = -pipe $(OE_QMAKE_CFLAGS)
++QMAKE_CFLAGS_DEPS       = -M
++QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
++QMAKE_CFLAGS_WARN_OFF   = -w
++QMAKE_CFLAGS_RELEASE    = -O2
++QMAKE_CFLAGS_DEBUG      = -g
++QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
++QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
++QMAKE_CFLAGS_SSE2       = -msse2 -mstackrealign
++QMAKE_CFLAGS_SSE3       = -msse3
++QMAKE_CFLAGS_SSSE3      = -mssse3
++QMAKE_CFLAGS_SSE4_1     = -msse4.1
++QMAKE_CFLAGS_SSE4_2     = -msse4.2
++QMAKE_CFLAGS_AVX        = -mavx
++QMAKE_CFLAGS_AVX2       = -mavx2
++QMAKE_CFLAGS_NEON       = -mfpu=neon
++
++QMAKE_CXX               = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
++QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
++QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
++QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
++QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
++QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
++QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
++QMAKE_CXXFLAGS_RTTI_ON  = -frtti
++QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
++QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
++QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
++QMAKE_CXXFLAGS_CXX11    = -std=c++0x
++QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS
++
++QMAKE_INCDIR            =
++
++QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
++QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
++QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
++QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
++
++QMAKE_LINK              = $(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS            = $(OE_QMAKE_LDFLAGS)
++QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
++QMAKE_LFLAGS_EXCEPTIONS_OFF =
++QMAKE_LFLAGS_RELEASE    = -Wl,-s
++QMAKE_LFLAGS_DEBUG      =
++QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
++QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
++QMAKE_LFLAGS_DLL        = -shared
++QMAKE_LFLAGS_CXX11      =
++QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
++QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
++QMAKE_LINK_OBJECT_MAX   = 10
++QMAKE_LINK_OBJECT_SCRIPT = object_script
++QMAKE_PREFIX_SHLIB      =
++QMAKE_EXTENSION_SHLIB   = dll
++QMAKE_PREFIX_STATICLIB  = lib
++QMAKE_EXTENSION_STATICLIB = a
++QMAKE_LIB_EXTENSIONS    = a dll.a
++
++QMAKE_LIBS              =
++QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
++QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
++QMAKE_LIBS_NETWORK      = -lws2_32
++QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2   = -llibEGL -llibGLESv2 -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
++QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
++QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
++
++QMAKE_IDL               = midl
++QMAKE_LIB               = $(OE_QMAKE_AR) -ru
++QMAKE_RC                = $(RC)
++
++QMAKE_STRIP             = $${OE_QMAKE_STRIP}
++QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
++QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
++QMAKE_NM                = $${CROSS_COMPILE}nm -P
++
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
++load(qt_config)
+diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
+new file mode 100644
+index 0000000..9d63527
+--- /dev/null
++++ b/mkspecs/win32-g++-oe/qplatformdefs.h
+@@ -0,0 +1,42 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** 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 Digia.  For licensing terms and
++** conditions see http://qt.digia.com/licensing.  For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights.  These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "../win32-g++/qplatformdefs.h"
+-- 
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 65a9b1d..0b4774a 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -39,20 +39,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
     file://oe-device-extra.pri \
+    file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
     "
 do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
 
-SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b"
 
 # Temporarily here, until merged upstream
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
 PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
-
-do_install_append() {
-    # Temporarily here, until merged upstream
-    sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \
-        -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
-        ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
-}
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 0a8d678..9478428 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index 67cd0dd..8057fbb 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -19,5 +19,6 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"
 
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 09944d9..626014a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "19dffeed2e677cf03b6e122c7a15f355ebe413c8"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index 972f725..7f854d5 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 4213bc9..f3895a6 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index a012288..3308e33 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -24,4 +24,5 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "526f459330d9bb5238479523f45aaa4caa958f77"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index eaebada..1793fdd 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -21,4 +21,5 @@
 
 PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
 
-SRCREV = "241444eab724ba0cb4fa142c5ccb02243b6f2dc2"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index f899df0..c7df857 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 457e0fd..d570ec2 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -22,4 +22,5 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
 
-SRCREV = "ad52d307cbff44b77bf7d4fa923377b72bb04374"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index d06444b..c833730 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -31,4 +31,5 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "c3f263509b64814ba12dbb627897de00b05230bc"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "48f32572590e45a57573944c0822855819d138df"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 188e736..7e72190 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "6ba354a0ec3bd3064d072cf170fe9f60f9ae3389"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index 56a80d9..27ed9e2 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 932f535..7244baf 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "eb59d8084af321d05b4ebdfb2c1e051dfdca0b62"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index e8b1d19..9c5261a 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -19,9 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
-
-PACKAGES += "${PN}-qtwebengine"
-FILES_${PN}-qtwebengine = " \
-    ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \
-"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index cd4d339..57cc2e7 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "29b8bd8b1117589341110502fe516bf22c920747"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
index 0828a42..2de879b 100644
--- a/recipes-qt/qt5/qtwayland_5.7-wip.bb
+++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb
@@ -21,7 +21,7 @@
 
 require recipes-qt/qt5/qtwayland_git.bb
 
-SRCREV = "600d845ff4a89982dd6a8c9fa0dd60b2bf861ff5"
+SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658"
 PV = "5.7-wip+git${SRCPV}"
 QT_MODULE_BRANCH = "wip-compositor-api"
 EXTRA_QMAKEVARS_PRE += "CONFIG+=explicitlib"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index cd4d339..57cc2e7 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
-SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV = "29b8bd8b1117589341110502fe516bf22c920747"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index ac958c0..2179f58 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea"
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 75d65a5..381bbbd 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -25,5 +25,6 @@ SRC_URI_append_mx6 = " \
     file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
     "
 
-SRCREV_qtwebengine = "bc2b0d81a8eff28852c9916a4768f05638d5d4cd"
+QT_MODULE_BRANCH = "5.6.0"
+SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f"
 SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 528e5b6..ea08e2e 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index 287ed42..f45b633 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -19,4 +19,5 @@
 ##
 ##############################################################################
 
+QT_MODULE_BRANCH = "5.6.0"
 SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915"
diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend
index e33637a..ca3437c 100644
--- a/recipes/dracut/dracut_git.bbappend
+++ b/recipes/dracut/dracut_git.bbappend
@@ -19,6 +19,10 @@
 ##
 ##############################################################################
 
+PV = "044+git${SRCREV}"
+SRCREV = "1bc3e733f96033a508841e97fe08da7a12851782"
+SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http"
+
 # Upstream recipe mistakenly depends on systemd, we remove that dependency here.
 RDEPENDS_${PN}_remove = "systemd"
 REQUIRED_DISTRO_FEATURES_remove = "systemd"
diff --git a/recipes/initramfs-basic/files/init.sh b/recipes/initramfs-basic/files/init.sh
new file mode 100644
index 0000000..3db235b
--- /dev/null
+++ b/recipes/initramfs-basic/files/init.sh
@@ -0,0 +1,102 @@
+#!/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
+    switch_real_root
+}
+
+main
diff --git a/recipes/initramfs-basic/init-basic.bb b/recipes/initramfs-basic/init-basic.bb
new file mode 100644
index 0000000..674e683
--- /dev/null
+++ b/recipes/initramfs-basic/init-basic.bb
@@ -0,0 +1,34 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+SUMMARY = "Simple init script that mounts root filesystem by label."
+LICENSE = "CLOSED"
+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/recipes/initramfs-basic/initramfs-basic.bb b/recipes/initramfs-basic/initramfs-basic.bb
new file mode 100644
index 0000000..4bef9c8
--- /dev/null
+++ b/recipes/initramfs-basic/initramfs-basic.bb
@@ -0,0 +1,40 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
+LICENSE = "CLOSED"
+
+# 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"
+
+BAD_RECOMMENDATIONS += "busybox-syslog"
+
diff --git a/recipes/os-release/os-release.bbappend b/recipes/os-release/os-release.bbappend
new file mode 100644
index 0000000..98e2d16
--- /dev/null
+++ b/recipes/os-release/os-release.bbappend
@@ -0,0 +1,39 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+# Reported upstream https://bugzilla.yoctoproject.org/show_bug.cgi?id=9144
+python do_fix_quotes () {
+    with open(d.expand('${B}/os-release'), 'w') as f:
+        for field in d.getVar('OS_RELEASE_FIELDS', True).split():
+            value = d.getVar(field, True)
+            if value:
+                f.write('{0}="{1}"\n'.format(field, value))
+}
+
+do_verify_if_fixed_by_upstream () {
+    pretty_name_first_char=$(cat ${B}/os-release | grep "^PRETTY_NAME" | cut -f 2 -d '=' | cut -c1)
+    if [ "${pretty_name_first_char}" = "\"" ]] ; then
+        bbwarn "Issue appears to be fixed by upstream, remove this workaround."
+    fi
+}
+
+addtask do_verify_if_fixed_by_upstream after do_compile before do_install
+addtask do_fix_quotes after do_verify_if_fixed_by_upstream before do_install
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index a0a1b8a..4dbafd5 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -32,6 +32,7 @@ SRC_URI = " \
     file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
     file://0003-Allow-updating-files-in-root-of-boot.patch \
     file://0004-Mount-boot-partition.patch \
+    file://0005-Do-not-use-grub2-mkconfig.patch \
     "
 
 SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
diff --git a/recipes/ostree/ostree/0004-Mount-boot-partition.patch b/recipes/ostree/ostree/0004-Mount-boot-partition.patch
index 092e142..a81f731 100644
--- a/recipes/ostree/ostree/0004-Mount-boot-partition.patch
+++ b/recipes/ostree/ostree/0004-Mount-boot-partition.patch
@@ -1,82 +1,60 @@
-From 5e9ed74a20026e5c9043eaf8a224ce84cb9cd9f0 Mon Sep 17 00:00:00 2001
+From 33642082578946fdc73ade8b78c05ba8d8521652 Mon Sep 17 00:00:00 2001
 From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Mon, 7 Dec 2015 18:14:26 +0100
-Subject: [PATCH] Mount boot partition
+Date: Mon, 7 Mar 2016 15:17:34 +0100
+Subject: [PATCH] ostree: Mount boot partition from user space
 
-On b2qt reference images the boot partition always is
-the first partition on a device and rootfs is the second
-partition. We can get the root parition from a kernel
-command line and deduce the right boot partition from there.
+In the current approach we assumed that boot/
+
+- is on a separate boot partition
+- boot partition is right before rootfs partition
+- rootfs parition is provided as a *device node*
+- has "ext2" filesystem (mount shell cmd tries to
+  auto detect FS type, mount system call does not.)
+
+The new approch does not assume any of the above, and
+moves this logic from early user space (initramfs) to
+user space. Initramfs by design should be used only to
+prepare the rootfs, other tasks should be done later.
 ---
- src/switchroot/ostree-prepare-root.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
+ src/switchroot/ostree-remount.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
 
-diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
-index 3de137b..2637dc3 100644
---- a/src/switchroot/ostree-prepare-root.c
-+++ b/src/switchroot/ostree-prepare-root.c
-@@ -45,7 +45,7 @@
- #include "ostree-mount-util.h"
- 
- static char *
--parse_ostree_cmdline (void)
-+parse_kernel_cmdline (const char *arg)
+diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
+index b8d3a96..33f2645 100644
+--- a/src/switchroot/ostree-remount.c
++++ b/src/switchroot/ostree-remount.c
+@@ -77,7 +77,7 @@ maybe_mount_tmpfs_on_var (void)
+ int
+ main(int argc, char *argv[])
  {
-   FILE *f = fopen("/proc/cmdline", "r");
-   char *cmdline = NULL;
-@@ -75,9 +75,9 @@ parse_ostree_cmdline (void)
-       const char *next_nonspc = next;
-       while (next_nonspc && *next_nonspc == ' ')
-        next_nonspc += 1;
--      if (strncmp (iter, "ostree=", strlen ("ostree=")) == 0)
-+      if (strncmp (iter, arg, strlen (arg)) == 0)
-         {
--         const char *start = iter + strlen ("ostree=");
-+   const char *start = iter + strlen (arg);
-          if (next)
-            ret = strndup (start, next - start);
-          else
-@@ -114,10 +114,12 @@ main(int argc, char *argv[])
-   const char *readonly_bind_mounts[] = { "/usr", NULL };
-   const char *root_mountpoint = NULL;
-   char *ostree_target = NULL;
-+  char *boot_partition = NULL;
-   char *deploy_path = NULL;
-   char srcpath[PATH_MAX];
-   char destpath[PATH_MAX];
-   char newroot[PATH_MAX];
-+  char boot_mountpoint[PATH_MAX];
+-  const char *remounts[] = { "/sysroot", "/etc", "/home", "/root", "/tmp", "/var", NULL };
++  const char *remounts[] = { "/sysroot", "/etc", "/home", "/root", "/tmp", "/var", "/boot", NULL };
    struct stat stbuf;
    int i;
  
-@@ -129,7 +131,7 @@ main(int argc, char *argv[])
+@@ -117,5 +117,22 @@ main(int argc, char *argv[])
  
-   root_mountpoint = argv[1];
+   maybe_mount_tmpfs_on_var ();
  
--  ostree_target = parse_ostree_cmdline ();
-+  ostree_target = parse_kernel_cmdline ("ostree=");
-   if (!ostree_target)
-     {
-       fprintf (stderr, "No OSTree target; expected ostree=/ostree/boot.N/...\n");
-@@ -246,6 +248,17 @@ main(int argc, char *argv[])
-       perrorv ("failed to MS_MOVE %s to %s", deploy_path, root_mountpoint);
-       exit (EXIT_FAILURE);
-     }
--  
-+
-+  /* first partition always is the boot partition */
-+  boot_partition = parse_kernel_cmdline ("root=");
-+  boot_partition[strlen (boot_partition) - 1] = '1';
-+  /* mount the real boot parition over the deployment's boot directory */
-+  snprintf (boot_mountpoint, sizeof(boot_mountpoint), "%s/boot/", root_mountpoint);
-+  if (mount (boot_partition, boot_mountpoint, "ext2", 0, NULL) < 0)
++  /* ostree-prepare-root mounts boot/ if it is on the same partition as root filesystem.
++   * If boot/ is not mounted, then it must be on a different partition. Try to mount
++   * filesystem where LABEL=boot-ostree.
++   */
++  if (!(lstat ("/boot/loader", &stbuf) == 0 && S_ISLNK (stbuf.st_mode)))
 +    {
-+       perrorv ("failed to mount boot parition %s to %s", boot_partition, boot_mountpoint);
-+       exit (EXIT_FAILURE);
++      /* mount the real boot parition over the deployment's boot directory */
++      const char *mount_cmd="mount LABEL=boot-ostree /boot";
++      FILE *fp = popen (mount_cmd, "w");
++      if (fp == NULL)
++        {
++          perrorv ("popen failed for: %s", mount_cmd);
++          exit (EXIT_FAILURE);
++        }
++      pclose (fp);
 +    }
 +
    exit (EXIT_SUCCESS);
  }
 -- 
-2.1.4
+2.7.0
 
diff --git a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
new file mode 100644
index 0000000..1414ff7
--- /dev/null
+++ b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
@@ -0,0 +1,60 @@
+From b613d60319beffc861f5b1faa906d2ee0c685f52 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Wed, 24 Feb 2016 18:12:27 +0100
+Subject: [PATCH] Do not use grub2-mkconfig.
+
+For details see: https://bugzilla.gnome.org/show_bug.cgi?id=762220
+---
+ src/libostree/ostree-bootloader-grub2.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
+index 1f89914..7cfb0dc 100644
+--- a/src/libostree/ostree-bootloader-grub2.c
++++ b/src/libostree/ostree-bootloader-grub2.c
+@@ -282,6 +282,8 @@ grub2_child_setup (gpointer user_data)
+     }
+ }
+ 
++#define OSTREE_NO_GRUB2_MKCONFIG
++
+ static gboolean
+ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+                                        int                    bootversion,
+@@ -300,6 +302,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+   g_autoptr(GFile) config_path_efi_dir = NULL;
+   g_autofree char *grub2_mkconfig_chroot = NULL;
+ 
++#ifndef OSTREE_NO_GRUB2_MKCONFIG
+   if (ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
+       && g_file_has_parent (self->sysroot->path, NULL))
+     {
+@@ -322,7 +325,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+       tool_deployment_root = ostree_sysroot_get_deployment_directory (self->sysroot, tool_deployment);
+       grub2_mkconfig_chroot = g_file_get_path (tool_deployment_root);
+     }
+-
++#endif
+   if (self->is_efi)
+     {
+       config_path_efi_dir = g_file_get_parent (self->config_path_efi);
+@@ -337,9 +340,16 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+                                                       bootversion);
+     }
+ 
++#ifdef OSTREE_NO_GRUB2_MKCONFIG
++  procctx = gs_subprocess_context_newv ("ostree-grub-generator", "-o",
++                                        gs_file_get_path_cached (new_config_path),
++                                        NULL);
++#else
+   procctx = gs_subprocess_context_newv ("grub2-mkconfig", "-o",
+                                         gs_file_get_path_cached (new_config_path),
+                                         NULL);
++#endif
++
+   child_env = g_environ_setenv (child_env, "_OSTREE_GRUB2_BOOTVERSION", bootversion_str, TRUE);
+   /* We have to pass our state to the child */
+   if (self->is_efi)
+-- 
+2.7.0
+
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index b95a8dc..5ba0e81 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="72ac998cef3306e6e4d2f3760af1c21cedfc330f"
+           revision="e29477ac42b47f4fedd2cb4be27ec2e4aa70540c"
            path="sources/meta-qt5"/>
 
   <project name="meta-mingw"
@@ -37,7 +37,7 @@
            remote="yocto"
            revision="c9f259a4bf8472dfa3ff75f1c3fcbe5e0ded7aaf"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
+           groups="notdefault,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
            revision="0a222c70845d19a2213ac36803361e8531768cca"
@@ -45,14 +45,14 @@
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="6314f668fa14473463bb777ffaf778333fea16eb"
+           revision="a42a1706de91ed03ae8798c7f9e70c30cebcf7de"
            path="sources/meta-raspberrypi"
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
            revision="ad90ca98459f5de9483bb3ba5a81be0a67b078c3"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
@@ -73,6 +73,7 @@
            revision="ead0a5c115e632015d8358f4f304ec8908732f5f"
            path="sources/meta-intel"
            groups="notdefault,nuc"/>
+
   <project name="meta-tegra"
            remote="playground"
            revision="3125d29a5c58a471b67104d1bff965df38eb3115"
@@ -83,6 +84,11 @@
            revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
            path="sources/jetson-tk1-pro"
            groups="notdefault,nvidia-logan"/>
+  <project name="meta-smx6"
+           remote="playground"
+           revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
+           path="sources/meta-smx6"
+           groups="notdefault,smx6"/>
 
 </manifest>
 
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index 6a7b308..3a13f40 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://git://playground.ci.local" name="playground"/>
+  <remote fetch="git://playground.ci.local" name="playground"/>
 
   <project name="poky"
            remote="yocto"
@@ -45,7 +45,7 @@
            groups="notdefault,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="fido"
+           revision="master"
            path="sources/meta-raspberrypi"
            groups="notdefault,rpi"/>
   <project name="meta-fsl-arm-extra"
@@ -73,6 +73,7 @@
            revision="fido"
            path="sources/meta-intel"
            groups="notdefault,nuc"/>
+
   <project name="meta-tegra"
            remote="playground"
            revision="master"
@@ -83,6 +84,10 @@
            revision="master"
            path="sources/jetson-tk1-pro"
            groups="notdefault,nvidia-logan"/>
-
+  <project name="meta-smx6"
+           remote="playground"
+           revision="fido"
+           path="sources/meta-smx6"
+           groups="notdefault,smx6"/>
 </manifest>
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index f681d14..28adeec 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -51,9 +51,12 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i)
+    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
+    smarc-samx6i)
+      LAYERSCONF="bblayers.conf.smx6.sample"
+    ;;
     tibidabo)
       LAYERSCONF="bblayers.conf.tibidabo.sample"
     ;;