125 files changed, 629 insertions, 2653 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 20b3d78..08abc2a 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -107,7 +107,7 @@ get_groups() {
      PROJECT_GROUPS="external"
    ;;
    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      PROJECT_GROUPS="toradex"
+      PROJECT_GROUPS="fsl"
    ;;
    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
      PROJECT_GROUPS="fsl"
@@ -118,13 +118,10 @@ get_groups() {
    tibidabo)
      PROJECT_GROUPS="architech"
    ;;
-    beagleboard|am335x-evm)
+    beagleboard|beaglebone|am335x-evm)
      PROJECT_GROUPS="ti"
    ;;
-    beaglebone)
+    raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
-      PROJECT_GROUPS="bbb"
-    ;;
-    raspberrypi|raspberrypi2|raspberrypi3)
      PROJECT_GROUPS="rpi"
    ;;
    intel-corei7-64)
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 2104b50..a0563ce 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -29,6 +29,7 @@
 BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}"
 BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
+BOOTFS_NAME[vardepsexclude] += "DATETIME"
 BOOTFS_DEPENDS ?= ""
diff --git a/classes/consistent_timestamps.bbclass b/classes/consistent_timestamps.bbclass
index 08cc401..1f560c2 100644
--- a/classes/consistent_timestamps.bbclass
+++ b/classes/consistent_timestamps.bbclass
@@ -28,8 +28,8 @@
 ############################################################################
 update_file_timestaps() {
-    # Update file timestamp to 0 seconds since Epoch time.
+    # Update file timestamp to 1 second since Epoch time.
-    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000' {} \;
+    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000.01' {} \;
 }
 ROOTFS_POSTINSTALL_COMMAND += "update_file_timestaps; "
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 05fd847..1391be1 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -27,18 +27,13 @@
 ##
 ############################################################################
-# need to define the dependency and the ROOTFS for directdisk
+VM_ROOTFS_TYPE = "ext3"
-do_bootdirectdisk[depends] += "${PN}:do_rootfs"
+ROOT_VM = "root=/dev/hda2"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+LABELS_VM = "boot"
+AUTO_SYSLINUXMENU = "0"
-SYSLINUX_ROOT = "root=/dev/hda2 "
-SYSLINUX_PROMPT = "0"
-SYSLINUX_TIMEOUT = "1"
-SYSLINUX_LABELS = "boot"
-LABELS_append = " ${SYSLINUX_LABELS} "
 SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
-inherit image_types boot-directdisk
+inherit image_types image-vm
 create_hdd_image () {
    cd ${DEPLOY_DIR_IMAGE}
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index 75c6e55..2902f96 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -38,10 +38,7 @@ replace_sysroot_symlink() {
                #check whether TARGET is inside the sysroot when not prepend the sysroot
                TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}`
                rm "${SOURCE}"
-                if [ -d "${TARGET}" ]; then
+                if [ -f "${TARGET}" ]; then
-                        cp -r "${TARGET}" "${SOURCE}"
-                        replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE}
-                elif [ -f "${TARGET}" ]; then
                        cp "${TARGET}" "${SOURCE}"
                elif [ -e "${TARGET}" ]; then
                        touch "${SOURCE}"
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
deleted file mode 100644
index ddd469b..0000000
--- a/conf/bblayers.conf.bbb.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# 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-beagleboard/common-bsp \
-  ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-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/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 75d7aae..381c488 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
@@ -47,7 +47,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 1a255de..61e12fa 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-fsl-arm-extra \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -50,7 +50,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample
index c03ad50..e6094d6 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-intel \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
@@ -49,7 +49,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index f893f8c..9a7272c 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
  ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -51,8 +51,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
index 1fbce2b..ec480ef 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
  ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -51,8 +51,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
index f19b1ea..6fc5144 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.rcar-gen2.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -38,7 +38,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-boot2qt \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-renesas \
@@ -51,7 +51,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-qt5 \
  ${BSPDIR}/sources/meta-mingw \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index c788ab0..e376bea 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-raspberrypi \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
@@ -49,7 +49,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 8b3e578..381c488 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,24 +37,13 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-beagleboard/common-bsp \
-  ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-raspberrypi \
-  ${BSPDIR}/sources/meta-toradex \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-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/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index 55a9535..b10e415 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-fsl-arm-extra \
  ${BSPDIR}/sources/meta-smx6 \
@@ -52,7 +52,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 527b404..8ad8960 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-ti \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -50,7 +50,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 6351d1f..e71d646 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -27,9 +27,9 @@
 ##
 ############################################################################
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "6"
+POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/poky/meta-poky \
  ${BSPDIR}/sources/meta-fsl-arm \
  ${BSPDIR}/sources/meta-fsl-arm-extra \
  ${BSPDIR}/sources/meta-tibidabo \
@@ -52,7 +52,3 @@ BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-mingw \
  ${BSPDIR}/sources/meta-qt5 \
  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-yocto \
-  "
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
deleted file mode 100644
index 7e49d04..0000000
--- a/conf/bblayers.conf.toradex.sample
+++ /dev/null
@@ -1,58 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# 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-toradex \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-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 bf0a05b..f5839a3 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -56,9 +56,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
-# backport from oe/krogoth, needed by meta-qt5
-PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
 DISTRO_FEATURES += "gstreamer"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 12f8a57..cc4f573 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -39,20 +39,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
 DISTRO_FEATURES_remove = "webengine"
-PREFERRED_VERSION_linux-ti-staging = "3.14%"
+MACHINE_EXTRA_INSTALL += "\
-PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
-PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
-MACHINE_EXTRA_INSTALL = "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
        lighttpd \
        "
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
-        libgles-omap3-dev \
        "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 1e8e876..7a2666b 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -27,7 +27,6 @@
 ##
 ############################################################################
-include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 include conf/distro/include/imx6-egl.inc
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index da4ed1c..372626f 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -34,34 +34,15 @@ DEPLOY_CONF_NAME = "BeagleBone Black"
 BOOTFS_CONTENT = "\
    u-boot-${MACHINE}.img:u-boot.img \
    MLO-${MACHINE}:MLO \
-    uEnv-${MACHINE}.txt:uEnv.txt \
    "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
+BOOTFS_DEPENDS = "u-boot:do_deploy"
-EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
 DISTRO_FEATURES_remove = "webengine"
-PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
+MACHINE_EXTRA_INSTALL += "\
-PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
-PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
-UBOOT_MACHINE = "am335x_boneblack_config"
-KERNEL_IMAGETYPE = "zImage"
-MACHINE_EXTRA_INSTALL = "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
        "
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
-        libgles-omap3-dev \
        "
 ADB_PRODUCTID = "0xD002"
-DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 0b4b12c..8a9bda5 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -27,7 +27,6 @@
 ##
 ############################################################################
-include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 include conf/distro/include/imx6-egl.inc
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 16d34e2..149894f 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
-include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 6b2c5bf..845e2ff 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -27,10 +27,6 @@
 ##
 ############################################################################
-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"
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index e686e85..25eb691 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -27,8 +27,7 @@
 ##
 ############################################################################
-BBMASK ?= " "
+BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
-BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 0f932c2..23c84c6 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -53,14 +53,13 @@ MACHINE_EXTRA_INSTALL_SDK = "\
 PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
 PREFERRED_PROVIDER_drm ?= "libdrm-nv"
-BBMASK ?= " "
+BBMASK += "\
-BBMASK .= "\
+    meta-vib3/recipes-kernel/linux-libc-headers \
-|meta-vib3/recipes-kernel/linux-libc-headers\
+    meta-vib3/recipes-devtools/binutils \
-|meta-vib3/recipes-devtools/binutils\
+    meta-vib3/recipes-core/eglibc \
-|meta-vib3/recipes-core/eglibc\
+    meta-vib3/recipes-core/systemd \
-|meta-vib3/recipes-core/systemd\
+    meta-vib3/recipes-connectivity \
-|meta-vib3/recipes-connectivity\
+    meta-vib3/recipes-multimedia/pulseaudio \
-|meta-vib3/recipes-multimedia/pulseaudio\
+    meta-vib3/recipes-core/meta/external-tegra-toolchain.bb \
-|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\
+    meta-vib3/recipes-core/packagegroups \
-|meta-vib3/recipes-core/packagegroups\
+    "
-"
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 10b11a3..802a673 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -53,6 +53,4 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
 VIDEO_CAMERA = "1"
 RPI_FT5604 = "1"
-KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
 MACHINE_FEATURES += "pitft"
diff --git a/recipes/udev/udev_182.bbappend b/conf/distro/include/raspberrypi0.conf
index bb44f9f..647e597 100644
--- a/recipes/udev/udev_182.bbappend
+++ b/conf/distro/include/raspberrypi0.conf
@@ -27,7 +27,11 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+include conf/distro/include/raspberrypi.inc
-SRC_URI += "file://0001-support-multitouch-screens.patch"
+DEPLOY_CONF_NAME = "Raspberry Pi Zero"
+DISTRO_FEATURES_remove = "webengine"
+# additional memory for GPU
+GPU_MEM = "128"
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index f196ad5..806c591 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -123,18 +123,17 @@ MACHINE_EXTRA_INSTALL_append_lcb = " \
 "
 BB_MULTIMEDIA_TEST_MODULE = "\
-|fdpm-tp-user-module\
+    fdpm-tp-user-module \
-|mmngr-tp-user-module\
+    mmngr-tp-user-module \
-|mmngrbuf-tp-user-module\
+    mmngrbuf-tp-user-module \
-|s3ctl-tp-user-module\
+    s3ctl-tp-user-module \
-|vspm-tp-user-module\
+    vspm-tp-user-module \
-"
+    "
-BBMASK ?= " "
+BBMASK += "\
-BBMASK .= "\
+    ${BB_MULTIMEDIA_TEST_MODULE} \
-${BB_MULTIMEDIA_TEST_MODULE}\
+    dtv-module ssp-module scu-module \
-|dtv-module|ssp-module|scu-module\
+    gles-test-module \
-|gles-test-module\
+    poky/meta/recipes-graphics/mesa \
-|poky/meta/recipes-graphics/mesa\
+    meta-fsl-arm/recipes-graphics/mesa \
-|meta-fsl-arm/recipes-graphics/mesa\
+    "
-"
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 95388b6..5695b1c 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -42,5 +42,4 @@ MACHINE_EXTRA_INSTALL = "\
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
-BBMASK ?= " "
+BBMASK += "meta-smx6/recipes-qt"
-BBMASK .= "|meta-smx6/recipes-qt"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index baf7f5c..189c4c9 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -62,18 +62,17 @@ PREFERRED_PROVIDER_wayland ?= "wayland-nv"
 PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
 PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
-BBMASK ?= " "
+BBMASK += "\
-BBMASK .= "\
+    meta-vib4/recipes-connectivity/connman \
-|meta-vib4/recipes-connectivity/connman\
+    meta-vib4/recipes-core/busybox \
-|meta-vib4/recipes-core/busybox\
+    meta-vib4/recipes-core/images \
-|meta-vib4/recipes-core/images\
+    meta-vib4/recipes-core/meta \
-|meta-vib4/recipes-core/meta\
+    meta-vib4/recipes-core/packagegroups \
-|meta-vib4/recipes-core/packagegroups\
+    meta-vib4/recipes-core/systemd/systemd \
-|meta-vib4/recipes-core/systemd/systemd\
+    meta-vib4/recipes-devtools \
-|meta-vib4/recipes-devtools\
+    meta-vib4/recipes-extended \
-|meta-vib4/recipes-extended\
+    meta-vib4/recipes-multimedia/audiomanager \
-|meta-vib4/recipes-multimedia/audiomanager\
+    meta-vib4/recipes-core/glibc \
-|meta-vib4/recipes-core/glibc\
+    meta-vib4/recipes-support/lvm2 \
-|meta-vib4/recipes-support/lvm2\
+    meta-vib4/recipes-kernel/linux-libc-headers \
-|meta-vib4/recipes-kernel/linux-libc-headers\
+    "
-"
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index a445dc2..a97511a 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -27,11 +27,23 @@
 ##
 ############################################################################
-BBMASK ?= " "
+BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
-BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_CLASSES += "image_types_fsl"
 UBOOT_SUFFIX = "img"
 BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+MACHINE_EXTRA_INSTALL += "\
+    ti-sgx-ddk-km \
+    ti-sgx-ddk-um \
+    "
+MACHINE_EXTRA_INSTALL_SDK += "\
+    ti-sgx-ddk-um-dev \
+    "
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 647362d..f448fbe 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -27,9 +27,6 @@
 ##
 ############################################################################
-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|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra"
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
diff --git a/meta-beagleboard-extras/conf/layer.conf b/meta-beagleboard-extras/conf/layer.conf
deleted file mode 100644
index 7307f55..0000000
--- a/meta-beagleboard-extras/conf/layer.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# 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_bb"
-BBFILE_PATTERN_b2qt_bb := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_bb = "20"
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch
deleted file mode 100755
index 97ce000..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1400fbf3e8e02eb1efd210a892a0d602061c7ca8 Mon Sep 17 00:00:00 2001
-From: Prathap M S <msprathap@ti.com>
-Date: Mon, 2 Sep 2013 11:42:13 +0530
-Subject: [PATCH 1/3] AM335x : Adding SGX DT node
-This adds the SGX DT node for AM335x.
-Signed-off-by: Prathap M S <msprathap@ti.com>
---
- arch/arm/boot/dts/am33xx.dtsi |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
-index 17e0da8..74c6e41 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
-+++ b/arch/arm/boot/dts/am33xx.dtsi
-@@ -96,6 +96,14 @@
-                        reg = <0x48200000 0x1000>;
-                };
- 
-+               sgx@0x56000000 {
-+                       compatible = "ti,sgx";
-+                       ti,hwmods = "gfx";
-+                       clock-frequency = <200000000>;
-+                       reg = <0x56000000 0x1000000>;
-+                       interrupts = <37>;
-+               };
-+
-                edma: edma@49000000 {
-                        compatible = "ti,edma3";
-                        ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
-- 
-1.7.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
deleted file mode 100644
index ee61a74..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
-From: Behan Webster <behanw@converseincode.com>
-Date: Wed, 24 Sep 2014 01:06:46 +0100
-Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
-With compilers which follow the C99 standard (like modern versions of gcc and
-clang), "extern inline" does the wrong thing (emits code for an externally
-linkable version of the inline function). In this case using static inline
-and removing the NULL version of return_address in return_address.c does
-the right thing.
-Signed-off-by: Behan Webster <behanw@converseincode.com>
-Reviewed-by: Mark Charlebois <charlebm@gmail.com>
-Acked-by: Steven Rostedt <rostedt@goodmis.org>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
- arch/arm/include/asm/ftrace.h    | 2 +-
- arch/arm/kernel/return_address.c | 5 -----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
-index f89515a..2bb8cac 100644
--- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@ void *return_address(unsigned int);
- 
- #else
- 
-extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
-        return NULL;
- }
-diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
-index fafedd8..f6aa84d 100644
--- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
- 
-void *return_address(unsigned int level)
-{
-       return NULL;
-}
-
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);
-- 
-1.9.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
deleted file mode 100644
index 66f031f..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 13 Apr 2016 15:42:49 +0300
-Subject: [PATCH] Change "extern inline" to "static inline"
-With compilers which follow the C99 standard (like modern versions of gcc and
-clang), "extern inline" does the wrong thing (emits code for an externally
-linkable version of the inline function). "static inline" is the correct choice
-instead.
---
- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
- drivers/staging/rtl8712/ieee80211.h            |  4 ++--
- lib/mpi/mpi-inline.h                           |  2 +-
- lib/mpi/mpi-internal.h                         | 16 ++++++++--------
- 4 files changed, 16 insertions(+), 16 deletions(-)
-diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
-index 502bfdb..1c8d026 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
-+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
-@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
-        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
- }
- 
-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
- {
-        /* Single white space is for Linksys APs */
-        if (essid_len == 1 && essid[0] == ' ')
-@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-        return 1;
- }
- 
-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
-+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
- {
-        /*
-         * It is possible for both access points and our device to support
-@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
-        return 0;
- }
- 
-extern inline int ieee80211_get_hdrlen(u16 fc)
-+static inline int ieee80211_get_hdrlen(u16 fc)
- {
-        int hdrlen = IEEE80211_3ADDR_LEN;
- 
-@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
- 
- extern const long ieee80211_wlan_frequencies[];
- 
-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
-+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
- {
-        ieee->scans++;
- }
- 
-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
-+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
- {
-        return ieee->scans;
- }
-diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
-index 21515c3..7518061 100644
--- a/drivers/staging/rtl8712/ieee80211.h
-+++ b/drivers/staging/rtl8712/ieee80211.h
-@@ -734,7 +734,7 @@ enum ieee80211_state {
- #define IEEE_G            (1<<2)
- #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
- 
-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
- {
-        /* Single white space is for Linksys APs */
-        if (essid_len == 1 && essid[0] == ' ')
-@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-        return 1;
- }
- 
-extern inline int ieee80211_get_hdrlen(u16 fc)
-+static inline int ieee80211_get_hdrlen(u16 fc)
- {
-        int hdrlen = 24;
- 
-diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
-index e2b3985..c245ea3 100644
--- a/lib/mpi/mpi-inline.h
-+++ b/lib/mpi/mpi-inline.h
-@@ -30,7 +30,7 @@
- #define G10_MPI_INLINE_H
- 
- #ifndef G10_MPI_INLINE_DECL
-#define G10_MPI_INLINE_DECL  extern inline
-+#define G10_MPI_INLINE_DECL  static inline
- #endif
- 
- G10_MPI_INLINE_DECL mpi_limb_t
-diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
-index 77adcf6..4566d11 100644
--- a/lib/mpi/mpi-internal.h
-+++ b/lib/mpi/mpi-internal.h
-@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
- int mpi_lshift_limbs(MPI a, unsigned int count);
- 
- /*-- mpihelp-add.c --*/
-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
-+//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-+//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
- mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                         mpi_ptr_t s2_ptr, mpi_size_t size);
-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
-+//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-+//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
- /*-- mpihelp-sub.c --*/
-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
-+//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-+//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
- mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
-                         mpi_ptr_t s2_ptr, mpi_size_t size);
-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
-+//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
-+//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
- 
- /*-- mpihelp-cmp.c --*/
- int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
-- 
-1.9.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
deleted file mode 100644
index 13a89fb..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 376075b9598d602950b73cc78743735585c0a18c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sasha.levin@oracle.com>
-Date: Mon, 13 Oct 2014 15:51:05 -0700
-Subject: [PATCH] kernel: add support for gcc 5
-commit 71458cfc782eafe4b27656e078d379a34e472adf upstream.
-We're missing include/linux/compiler-gcc5.h which is required now
-because gcc branched off to v5 in trunk.
-Just copy the relevant bits out of include/linux/compiler-gcc4.h,
-no new code is added as of now.
-This fixes a build error when using gcc 5.
-Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
- create mode 100644 include/linux/compiler-gcc5.h
-diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
-new file mode 100644
-index 0000000..cdd1cc2
--- /dev/null
-+++ b/include/linux/compiler-gcc5.h
-@@ -0,0 +1,66 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
-+#endif
-+
-+#define __used                         __attribute__((__used__))
-+#define __must_check                   __attribute__((warn_unused_result))
-+#define __compiler_offsetof(a, b)      __builtin_offsetof(a, b)
-+
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+   to them will be unlikely.  This means a lot of manual unlikely()s
-+   are unnecessary now for any paths leading to the usual suspects
-+   like BUG(), printk(), panic() etc. [but let's keep them for now for
-+   older compilers]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   gcc also has a __attribute__((__hot__)) to move hot functions into
-+   a special section, but I don't see any sense in this right now in
-+   the kernel context */
-+#define __cold                 __attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone      __attribute__((__noclone__))
-+
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible __attribute__((externally_visible))
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ * Fixed in GCC 4.8.2 and later versions.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)        do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
-- 
-1.9.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch
deleted file mode 100755
index 05672d3..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 4179cd27a2caa23688646e043e2872e89c9a7bc7 Mon Sep 17 00:00:00 2001
-From: Prathap M S <msprathap@ti.com>
-Date: Mon, 2 Sep 2013 11:52:03 +0530
-Subject: [PATCH 2/3] AM33XX : Invoke hwmod deassert for SGX(graphics device)
-By default reset is asserted for SGX.
-Adding gpu.c file introducing omap_sgx_init_of() for deasserting SGX reset.
-This calls omap_device_deassert_hardreset() for deasserting the reset for SGX.
-Signed-off-by: Prathap M S <msprathap@ti.com>
---
- arch/arm/mach-omap2/Makefile        |    2 +-
- arch/arm/mach-omap2/board-generic.c |    4 +++
- arch/arm/mach-omap2/common.h        |    1 +
- arch/arm/mach-omap2/gpu.c           |   48 +++++++++++++++++++++++++++++++++++
- 4 files changed, 54 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/mach-omap2/gpu.c
-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
-index d4f6715..b65cc56 100644
--- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -8,7 +8,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
- # Common support
- obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
-         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
-        omap_device.o sram.o
-+        omap_device.o sram.o gpu.o
- 
- omap-2-3-common                                = irq.o
- hwmod-common                           = omap_hwmod.o omap_hwmod_reset.o \
-diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
-index be5d005..e2b3981 100644
--- a/arch/arm/mach-omap2/board-generic.c
-+++ b/arch/arm/mach-omap2/board-generic.c
-@@ -22,6 +22,7 @@
- #include "common.h"
- #include "common-board-devices.h"
- #include "dss-common.h"
-+#include "soc.h"
- 
- #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
- #define intc_of_init   NULL
-@@ -50,6 +50,8 @@ static void __init omap_generic_init(void)
-                omap4_panda_display_init_of();
-        else if (of_machine_is_compatible("ti,omap4-sdp"))
-                omap_4430sdp_display_init_of();
-+       if (omap3_has_sgx())
-+               omap_sgx_init_of();
- }
- 
- #ifdef CONFIG_SOC_OMAP2420
-diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
-index dfcc182..7d2f04e 100644
--- a/arch/arm/mach-omap2/common.h
-+++ b/arch/arm/mach-omap2/common.h
-@@ -296,6 +296,7 @@ extern void omap_reserve(void);
- 
- struct omap_hwmod;
- extern int omap_dss_reset(struct omap_hwmod *);
-+void __init omap_sgx_init_of(void);
- 
- /* SoC specific clock initializer */
- extern int (*omap_clk_init)(void);
-diff --git a/arch/arm/mach-omap2/gpu.c b/arch/arm/mach-omap2/gpu.c
-new file mode 100644
-index 0000000..98a66cf
--- /dev/null
-+++ b/arch/arm/mach-omap2/gpu.c
-@@ -0,0 +1,48 @@
-+/*
-+ * Deassert reset for AM33xx graphics device(SGX) hwmod
-+ *
-+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
-+ * Prathap MS <msprathap@ti.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation version 2.
-+ *
-+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-+ * kind, whether express or implied; without even the implied warranty
-+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+#include <linux/of_platform.h>
-+#include "omap_device.h"
-+
-+void __init omap_sgx_init_of(void)
-+{
-+       struct device_node *node;
-+       struct platform_device *pdev;
-+       int ret = 0;
-+       node = of_find_compatible_node(NULL, NULL, "ti,sgx");
-+       if (!node)
-+               return;
-+       pdev = of_find_device_by_node(node);
-+       if (!pdev) {
-+               pr_warn("of_find_device_by_node() failed for sgx\n");
-+               return;
-+       }
-+       ret = omap_device_deassert_hardreset(pdev, "gfx");
-+       if (ret != 0)
-+               pr_warn("omap_device_deassert_hardreset() failed for sgx(gfx hwmod)\n");
-+
-+       node = of_find_compatible_node(NULL, NULL, "ti,am335x-timer");
-+       if (!node)
-+               return;
-+       pdev = of_find_device_by_node(node);
-+       if (!pdev) {
-+               pr_warn("of_find_device_by_node() failed for sgx\n");
-+               return;
-+       }
-+       ret = omap_device_deassert_hardreset(pdev, "timer7");
-+       if (ret != 0)
-+               pr_warn("omap_device_deassert_hardreset() failed for sgx(gfx hwmod)\n");
-+}
-+
-- 
-1.7.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
deleted file mode 100755
index c425982..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0f4e7d4b7d7314b38a9fd3497d7d4e0c36d19bff Mon Sep 17 00:00:00 2001
-From: Prathap M S <msprathap@ti.com>
-Date: Mon, 2 Sep 2013 12:05:23 +0530
-Subject: [PATCH 3/3] video: da8xx-fb: Add API to register wait for vsync callback
-This patch adds APIs to register and unregister wait for vsync callback.
-This is derived from commit id 2d44302545da24fd22912d964102bc31a7489e97
-This commit id was part of 3.2 kernel sources.
-Signed-off-by: Prathap M S <msprathap@ti.com>
---
- drivers/video/da8xx-fb.c |   33 +++++++++++++++++++++++++++++++++
- include/video/da8xx-fb.h |    4 ++++
- 2 files changed, 37 insertions(+), 0 deletions(-)
-diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
-index 131cf4c..ef06b85 100644
--- a/drivers/video/da8xx-fb.c
-+++ b/drivers/video/da8xx-fb.c
-@@ -199,6 +199,9 @@ static struct fb_fix_screeninfo da8xx_fb_fix = {
-        .accel = FB_ACCEL_NONE
- };
- 
-+static vsync_callback_t vsync_cb_handler;
-+static void *vsync_cb_arg;
-+
- static struct fb_videomode known_lcd_panels[] = {
-        /* Sharp LCD035Q3DG01 */
-        [0] = {
-@@ -806,6 +809,32 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
-        return 0;
- }
- 
-+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx)
-+{
-+       if ((vsync_cb_handler == NULL) && (vsync_cb_arg == NULL)) {
-+               vsync_cb_arg = arg;
-+               vsync_cb_handler = handler;
-+       } else {
-+               return -EEXIST;
-+       }
-+
-+       return 0;
-+}
-+EXPORT_SYMBOL(register_vsync_cb);
-+
-+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx)
-+{
-+       if ((vsync_cb_handler == handler) && (vsync_cb_arg == arg)) {
-+               vsync_cb_handler = NULL;
-+               vsync_cb_arg = NULL;
-+       } else {
-+               return -ENXIO;
-+       }
-+
-+       return 0;
-+}
-+EXPORT_SYMBOL(unregister_vsync_cb);
-+
- /* IRQ handler for version 2 of LCDC */
- static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
- {
-@@ -843,6 +872,8 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
-                                   LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG);
-                        par->vsync_flag = 1;
-                        wake_up_interruptible(&par->vsync_wait);
-+                       if (vsync_cb_handler)
-+                               vsync_cb_handler(vsync_cb_arg);
-                }
- 
-                if (stat & LCD_END_OF_FRAME1) {
-@@ -918,6 +949,8 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
-                                   LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
-                        par->vsync_flag = 1;
-                        wake_up_interruptible(&par->vsync_wait);
-+                       if (vsync_cb_handler)
-+                               vsync_cb_handler(vsync_cb_arg);
-                }
-        }
- 
-diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
-index efed3c3..a6cc484 100644
--- a/include/video/da8xx-fb.h
-+++ b/include/video/da8xx-fb.h
-@@ -91,5 +91,9 @@ struct lcd_sync_arg {
- /* Proprietary FB_SYNC_ flags */
- #define FB_SYNC_CLK_INVERT 0x40000000
- 
-+typedef void (*vsync_callback_t)(void *arg);
-+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx);
-+
- #endif  /* ifndef DA8XX_FB_H */
- 
-- 
-1.7.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff
deleted file mode 100644
index 13b251a..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-From 8221f36672b7a1336c2bf245c394f0b5453784a1 Mon Sep 17 00:00:00 2001
-From: Will Deacon <will.deacon@arm.com>
-Date: Thu, 26 Sep 2013 12:36:35 +0100
-Subject: [PATCH] ARM: perf: add support for perf registers API
-This patch implements the functions required for the perf registers API,
-allowing the perf tool to interface kernel register dumps with libunwind
-in order to provide userspace backtracing.
-B2Qt: Backported for 3.8 kernel
-Cc: Jean Pihet <jean.pihet@linaro.org>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
---
- arch/arm/Kconfig                      |  2 ++
- arch/arm/include/uapi/asm/Kbuild      |  1 +
- arch/arm/include/uapi/asm/perf_regs.h | 23 +++++++++++++++++++++++
- arch/arm/kernel/Makefile              |  1 +
- arch/arm/kernel/perf_regs.c           | 30 ++++++++++++++++++++++++++++++
- 5 files changed, 57 insertions(+)
- create mode 100644 arch/arm/include/uapi/asm/perf_regs.h
- create mode 100644 arch/arm/kernel/perf_regs.c
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 67874b8..6f630be 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -46,6 +46,8 @@ config ARM
-        select HAVE_MEMBLOCK
-        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
-        select HAVE_PERF_EVENTS
-+       select HAVE_PERF_REGS
-+       select HAVE_PERF_USER_STACK_DUMP
-        select HAVE_REGS_AND_STACK_ACCESS_API
-        select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_UID16
-diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
-index 47bcb2d..570b82f 100644
--- a/arch/arm/include/uapi/asm/Kbuild
-+++ b/arch/arm/include/uapi/asm/Kbuild
-@@ -8,6 +8,7 @@ header-y += hwcap.h
- header-y += ioctls.h
- header-y += kvm_para.h
- header-y += mman.h
-+header-y += perf_regs.h
- header-y += posix_types.h
- header-y += ptrace.h
- header-y += setup.h
-diff --git a/arch/arm/include/uapi/asm/perf_regs.h b/arch/arm/include/uapi/asm/perf_regs.h
-new file mode 100644
-index 0000000..ce59448
--- /dev/null
-+++ b/arch/arm/include/uapi/asm/perf_regs.h
-@@ -0,0 +1,23 @@
-+#ifndef _ASM_ARM_PERF_REGS_H
-+#define _ASM_ARM_PERF_REGS_H
-+
-+enum perf_event_arm_regs {
-+       PERF_REG_ARM_R0,
-+       PERF_REG_ARM_R1,
-+       PERF_REG_ARM_R2,
-+       PERF_REG_ARM_R3,
-+       PERF_REG_ARM_R4,
-+       PERF_REG_ARM_R5,
-+       PERF_REG_ARM_R6,
-+       PERF_REG_ARM_R7,
-+       PERF_REG_ARM_R8,
-+       PERF_REG_ARM_R9,
-+       PERF_REG_ARM_R10,
-+       PERF_REG_ARM_FP,
-+       PERF_REG_ARM_IP,
-+       PERF_REG_ARM_SP,
-+       PERF_REG_ARM_LR,
-+       PERF_REG_ARM_PC,
-+       PERF_REG_ARM_MAX,
-+};
-+#endif /* _ASM_ARM_PERF_REGS_H */
-diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
-index 5bbec7b..c6ab18f 100644
--- a/arch/arm/kernel/Makefile
-+++ b/arch/arm/kernel/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_CPU_XSC3)                += xscale-cp0.o
- obj-$(CONFIG_CPU_MOHAWK)       += xscale-cp0.o
- obj-$(CONFIG_CPU_PJ4)          += pj4-cp0.o
- obj-$(CONFIG_IWMMXT)           += iwmmxt.o
-+obj-$(CONFIG_PERF_EVENTS)      += perf_regs.o
- obj-$(CONFIG_HW_PERF_EVENTS)   += perf_event.o perf_event_cpu.o
- AFLAGS_iwmmxt.o                        := -Wa,-mcpu=iwmmxt
- obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
-diff --git a/arch/arm/kernel/perf_regs.c b/arch/arm/kernel/perf_regs.c
-new file mode 100644
-index 0000000..6e4379c
--- /dev/null
-+++ b/arch/arm/kernel/perf_regs.c
-@@ -0,0 +1,30 @@
-+
-+#include <linux/errno.h>
-+#include <linux/kernel.h>
-+#include <linux/perf_event.h>
-+#include <linux/bug.h>
-+#include <asm/perf_regs.h>
-+#include <asm/ptrace.h>
-+
-+u64 perf_reg_value(struct pt_regs *regs, int idx)
-+{
-+       if (WARN_ON_ONCE((u32)idx >= PERF_REG_ARM_MAX))
-+               return 0;
-+
-+       return regs->uregs[idx];
-+}
-+
-+#define REG_RESERVED (~((1ULL << PERF_REG_ARM_MAX) - 1))
-+
-+int perf_reg_validate(u64 mask)
-+{
-+       if (!mask || mask & REG_RESERVED)
-+               return -EINVAL;
-+
-+       return 0;
-+}
-+
-+u64 perf_reg_abi(struct task_struct *task)
-+{
-+       return PERF_SAMPLE_REGS_ABI_32;
-+}
-- 
-1.9.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch
deleted file mode 100644
index e3e8d21..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 26f603c457e0af9f5f6a0ddda66e69978c7f43b4 Mon Sep 17 00:00:00 2001
-From: Will Deacon <will.deacon@arm.com>
-Date: Thu, 26 Sep 2013 12:36:36 +0100
-Subject: [PATCH] ARM: perf: wire up perf_regs and unwind support for ARM
-This patch hooks in the perf_regs and libunwind code for ARM.
-B2Qt: Backported for 3.8 kernel
-Cc: Jean Pihet <jean.pihet@linaro.org>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
---
- tools/perf/Makefile                     |  4 +++
- tools/perf/arch/arm/Makefile            |  3 ++
- tools/perf/arch/arm/include/perf_regs.h | 54 +++++++++++++++++++++++++++++++++
- tools/perf/arch/arm/util/unwind.c       | 48 +++++++++++++++++++++++++++++
- 4 files changed, 109 insertions(+)
- create mode 100644 tools/perf/arch/arm/include/perf_regs.h
- create mode 100644 tools/perf/arch/arm/util/unwind.c
-diff --git a/tools/perf/Makefile b/tools/perf/Makefile
-index fb1b1c4..316c575 100644
--- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -84,6 +84,10 @@ ifeq ($(ARCH),x86_64)
-        NO_PERF_REGS := 0
-        LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
- endif
-+ifeq ($(ARCH),arm)
-+  NO_PERF_REGS := 0
-+  LIBUNWIND_LIBS = -lunwind -lunwind-arm
-+endif
- 
- # Treat warnings as errors unless directed not to
- ifneq ($(WERROR),0)
-diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile
-index 15130b5..fe9b61e 100644
--- a/tools/perf/arch/arm/Makefile
-+++ b/tools/perf/arch/arm/Makefile
-@@ -2,3 +2,6 @@ ifndef NO_DWARF
- PERF_HAVE_DWARF_REGS := 1
- LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
- endif
-+ifndef NO_LIBUNWIND
-+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
-+endif
-diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h
-new file mode 100644
-index 0000000..2a1cfde
--- /dev/null
-+++ b/tools/perf/arch/arm/include/perf_regs.h
-@@ -0,0 +1,54 @@
-+#ifndef ARCH_PERF_REGS_H
-+#define ARCH_PERF_REGS_H
-+
-+#include <stdlib.h>
-+#include "../../util/types.h"
-+#include <asm/perf_regs.h>
-+
-+#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1)
-+#define PERF_REG_IP    PERF_REG_ARM_PC
-+#define PERF_REG_SP    PERF_REG_ARM_SP
-+
-+static inline const char *perf_reg_name(int id)
-+{
-+       switch (id) {
-+       case PERF_REG_ARM_R0:
-+               return "r0";
-+       case PERF_REG_ARM_R1:
-+               return "r1";
-+       case PERF_REG_ARM_R2:
-+               return "r2";
-+       case PERF_REG_ARM_R3:
-+               return "r3";
-+       case PERF_REG_ARM_R4:
-+               return "r4";
-+       case PERF_REG_ARM_R5:
-+               return "r5";
-+       case PERF_REG_ARM_R6:
-+               return "r6";
-+       case PERF_REG_ARM_R7:
-+               return "r7";
-+       case PERF_REG_ARM_R8:
-+               return "r8";
-+       case PERF_REG_ARM_R9:
-+               return "r9";
-+       case PERF_REG_ARM_R10:
-+               return "r10";
-+       case PERF_REG_ARM_FP:
-+               return "fp";
-+       case PERF_REG_ARM_IP:
-+               return "ip";
-+       case PERF_REG_ARM_SP:
-+               return "sp";
-+       case PERF_REG_ARM_LR:
-+               return "lr";
-+       case PERF_REG_ARM_PC:
-+               return "pc";
-+       default:
-+               return NULL;
-+       }
-+
-+       return NULL;
-+}
-+
-+#endif /* ARCH_PERF_REGS_H */
-diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind.c
-new file mode 100644
-index 0000000..da3dc95
--- /dev/null
-+++ b/tools/perf/arch/arm/util/unwind.c
-@@ -0,0 +1,48 @@
-+
-+#include <errno.h>
-+#include <libunwind.h>
-+#include "perf_regs.h"
-+#include "../../util/unwind.h"
-+
-+int unwind__arch_reg_id(int regnum)
-+{
-+       switch (regnum) {
-+       case UNW_ARM_R0:
-+               return PERF_REG_ARM_R0;
-+       case UNW_ARM_R1:
-+               return PERF_REG_ARM_R1;
-+       case UNW_ARM_R2:
-+               return PERF_REG_ARM_R2;
-+       case UNW_ARM_R3:
-+               return PERF_REG_ARM_R3;
-+       case UNW_ARM_R4:
-+               return PERF_REG_ARM_R4;
-+       case UNW_ARM_R5:
-+               return PERF_REG_ARM_R5;
-+       case UNW_ARM_R6:
-+               return PERF_REG_ARM_R6;
-+       case UNW_ARM_R7:
-+               return PERF_REG_ARM_R7;
-+       case UNW_ARM_R8:
-+               return PERF_REG_ARM_R8;
-+       case UNW_ARM_R9:
-+               return PERF_REG_ARM_R9;
-+       case UNW_ARM_R10:
-+               return PERF_REG_ARM_R10;
-+       case UNW_ARM_R11:
-+               return PERF_REG_ARM_FP;
-+       case UNW_ARM_R12:
-+               return PERF_REG_ARM_IP;
-+       case UNW_ARM_R13:
-+               return PERF_REG_ARM_SP;
-+       case UNW_ARM_R14:
-+               return PERF_REG_ARM_LR;
-+       case UNW_ARM_R15:
-+               return PERF_REG_ARM_PC;
-+       default:
-+               pr_err("unwind: invalid reg id %d\n", regnum);
-+               return -EINVAL;
-+       }
-+
-+       return -EINVAL;
-+}
-- 
-1.9.1
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
deleted file mode 100644
index 3c61e27..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ /dev/null
@@ -1,52 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://0001-AM335x-Adding-SGX-DT-node.patch \
-    file://0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch \
-    file://0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch \
-    file://ARM-perf-add-support-for-perf-registers-API.diff \
-    file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
-    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
-    file://0001-kernel-add-support-for-gcc-5.patch \
-    file://0001-Change-extern-inline-to-static-inline.patch \
-    "
-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
-    echo "CONFIG_MOUSE_PS2=n"  >> ${WORKDIR}/defconfig
-}
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
deleted file mode 100644
index 26ae06e..0000000
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-DESCRIPTION = "U-Boot script to start up BeagleBone Black"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-PR = "r0"
-COMPATIBLE_MACHINE = "(beaglebone)"
-PV = "20140225"
-SRC_URI = "file://uEnv.txt"
-inherit deploy
-do_deploy () {
-    install -d ${DEPLOYDIR}
-    install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt
-    cd ${DEPLOYDIR}
-    rm -f uEnv-${MACHINE}.txt
-    ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt
-}
-addtask deploy after do_install before do_build
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
deleted file mode 100644
index d41ef60..0000000
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-optargs=consoleblank=0 vt.global_cursor_default=0 quiet
-# extra options to support older u-boot (2013)
-bootfile=zImage
-loadaddr=0x80200000
-loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
-mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${loadaddr} - ${fdtaddr}
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
index fb5280c..001a3c7 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
@@ -35,6 +35,6 @@ SRC_URI += " \
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
-do_configure_prepend() {
+do_preconfigure_prepend() {
    echo "CONFIG_HID_MULTITOUCH=m"              >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
index c21fece..c4e0158 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -30,7 +30,7 @@
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
-do_configure_prepend() {
+do_preconfigure_prepend() {
    # FunctionFS for adb
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_3.14-1.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index c21fece..c4e0158 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_3.14-1.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -30,7 +30,7 @@
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""
-do_configure_prepend() {
+do_preconfigure_prepend() {
    # FunctionFS for adb
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index b696b19..b696b19 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 77ce484..77ce484 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend
index c5201a0..c5201a0 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2015.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
index b5d96b6..b5d96b6 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch
index 5c62eb1..5c62eb1 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr
index 398c4de..398c4de 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr
index 2f64288..2f64288 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch
index cf01d59..cf01d59 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr
index 23c5b72..23c5b72 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr
index 14f4104..14f4104 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
index 08ddd88..08ddd88 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
index b63366a..b63366a 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
index 13025de..13025de 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
index f096c2e..f096c2e 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
index 8fa5af9..8fa5af9 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
index aa98b3a..aa98b3a 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr
index 7af72e6..7af72e6 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr
index d7ea35c..d7ea35c 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr
index 4c8f666..4c8f666 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
index 3e05a85..3e05a85 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
index 0c16652..0c16652 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
index 135dfd8..135dfd8 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
index 9f98fc3..9f98fc3 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 9cb2075..1f5fd9f 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -33,15 +33,6 @@ 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() {
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index 8a223fe..0104aab 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -30,6 +30,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://grub.cfg"
+do_install[depends] += " \
+    virtual/kernel:do_deploy \
+    ${INITRAMFS_IMAGE}:do_rootfs \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
+"
 do_deploy_prepend() {
 cat > ${WORKDIR}/cfg <<EOF
@@ -42,7 +48,12 @@ do_install_append() {
    install -d ${D}/boot/grub2/
    install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
+    # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
+    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${D}/boot/initramfs
+    chmod 0644 ${D}/boot/initramfs
 }
 PACKAGES += "${PN}-config"
-FILES_${PN}-config = "/boot/grub2/"
+FILES_${PN}-config = "/boot/grub2/ /boot/initramfs"
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend
index 2879e65..2879e65 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
+++ b/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend
diff --git a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
index dbeb030..13ac255 100644
--- a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
+++ b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+EXTRA_OECONF_append_rpi = " LDFLAGS='-lbcm_host'"
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr b/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr
deleted file mode 100755
index d6f6c82..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/usr/sbin
-# Check if an fb device is available.  If not then just go ahead and
-# exit because we have no display.
-fbset > /dev/null 2>&1
-if [ "$?" == "1" ]
-then
-    # looks like there is no display, so let's exit
-    exit 0
-fi
-BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
-YRES="$(fbset | grep geom | awk '{print $3}')"
-CPUTYPE="$(cputype)"
-if [ "$1" = "" ]; then
-        echo PVR-INIT: Please use start, stop, or restart.
-        exit 1
-fi
-if [ "$1" = "stop" -o  "$1" = "restart" ]; then
-        echo Stopping PVR
-        rmmod bufferclass_ti
-        rmmod omaplfb 2>/dev/null
-        rmmod pvrsrvkm 2>/dev/null
-fi
-if [ "$1" = "stop" ]; then
-        exit 0
-fi
-# Set RGBA ordering to something the drivers like
-if [ "$BITSPERPIXEL" = "32" ] ; then
-        fbset -rgba 8/16,8/8,8/0,8/24
-fi
-# Try to enable triple buffering when there's enough VRAM
-fbset -vyres $(expr $YRES \* 3)
-sgxprepare () {
-        echo Starting PVR
-        modprobe omaplfb
-        modprobe bufferclass_ti
-        pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
-        bc_maj=`grep "bc" /proc/devices | cut -b1,2,3`
-        if [ -e /dev/pvrsrvkm ] ; then
-                rm -f /dev/pvrsrvkm
-        fi
-        mknod /dev/pvrsrvkm c $pvr_maj 0
-        chmod 666 /dev/pvrsrvkm
-        touch /etc/powervr-esrev
-        SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
-}
-sgxfinish () {
-        # Fix up a bug in opkg
-        if [ $(readlink /usr/lib/libsrv_um.so) != $(readlink /usr/lib/libsrv_um.so.1) ] ; then
-                cd /usr/lib
-                ln -sf $(readlink /usr/lib/libsrv_um.so.1) libsrv_um.so
-        fi
-        if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
-                echo -n "Starting SGX fixup for"
-                echo " ES${ES_REVISION}.x"
-                cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib
-                cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin
-                echo "${ES_REVISION}" > /etc/powervr-esrev
-        fi
-        /usr/bin/pvrsrvctl --start --no-module
-}
-case $CPUTYPE in
-"OMAP3530")
-        sgxprepare
-        devmem2 0x48004B48 w 0x2 > /dev/null
-        devmem2 0x48004B10 w 0x1 > /dev/null
-        devmem2 0x48004B00 w 0x2 > /dev/null
-        ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
-        sgxfinish
-        ;;
-"TI33XX")
-        sgxprepare
-        devmem2 0x44e01104 w 0x0 > /dev/null
-        devmem2 0x44e00904 w 0x2 > /dev/null
-        ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:8: | tail -n1 | awk -F': ' '{print $2}')"
-        sgxfinish
-        ;;
-"TI816x")
-        sgxprepare
-        devmem2 0x48180F04 w 0x0 > /dev/null
-        devmem2 0x48180900 w 0x2 > /dev/null
-        devmem2 0x48180920 w 0x2 > /dev/null
-        ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
-        sgxfinish
-        ;;
-*)
-        echo No SGX hardware, not starting PVR
-        ;;
-esac
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
deleted file mode 100644
index 3d909f9..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ /dev/null
@@ -1,50 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
-do_install_append() {
-    echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
-}
-# Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_STRIP = "1"
-pkg_postinst_${PN}_append() {
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
-}
-RRECOMMENDS_${PN} = "omap3-sgx-modules"
-RRECOMMENDS_${PN}-blitwsegl = ""
-RRECOMMENDS_${PN}-flipwsegl = ""
-RRECOMMENDS_${PN}-frontwsegl = ""
-RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
deleted file mode 100644
index 1b1bf22..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-require recipes-graphics/libgles/libgles-omap3-no-x.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${COREBASE}/../meta-ti/recipes-graphics/libgles/${PN}:"
-LICENSE = "TI-TSPA"
-PR = "${INC_PR}.3"
-BINLOCATION_omap3 = "${S}/gfx_rel_es3.x"
-BINLOCATION_ti816x = "${S}/gfx_rel_es6.x"
-BINLOCATION_ti814x = "${S}/gfx_rel_es6.x"
-BINLOCATION_ti33x = "${S}/gfx_rel_es8.x"
-PLATFORM = "LinuxARMV7"
-PVR_INIT = "pvrsrvctl"
-# download required binary distribution from:
-# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
-# see libgles-omap3.inc for detailed installation instructions
-SGXPV = "4_10_00_01"
-IMGPV = "1.9.2188537"
-TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
-# Select the corresponding hardfp/softfp filename and checksums based on tune flags
-BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
-MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
-SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
-MD5SUM_HARDFP = "15a3ccb66e98580e474fc112565f66b6"
-SHA256SUM_HARDFP = "4d94d5a1869b228ce12027783fc5425c92e9b66685c501247889f1f167e66c9d"
-BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
-           file://cputype \
-           file://rc.pvr \
-           file://99-bufferclass.rules  \
-"
-SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
-SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
-S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FRONTWSEGL.so.1"
-do_configure_append() {
-    # PLAT_CC might not have needed arguments, so use CC instead.
-    for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do
-        sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak
-    done
-}
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
deleted file mode 100644
index 0d557ce..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
+++ /dev/null
@@ -1,49 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
-BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
-# Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_STRIP = "1"
-pkg_postinst_${PN}_append() {
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
-}
-RRECOMMENDS_${PN} = "omap3-sgx-modules"
-RRECOMMENDS_${PN}-blitwsegl = ""
-RRECOMMENDS_${PN}-flipwsegl = ""
-RRECOMMENDS_${PN}-frontwsegl = ""
-RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
index 54dca0f..fb3bc7a 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
@@ -32,4 +32,3 @@ SRC_URI += "\
    file://usb-serial.cfg \
    "
 KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
-KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch
deleted file mode 100644
index ce50479..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e55f63a07e5266095da89b7f94122fcba9bdef04 Mon Sep 17 00:00:00 2001
-From: Prathap M S <msprathap@ti.com>
-Date: Tue, 19 Nov 2013 16:33:24 +0530
-Subject: [PATCH 1/1] Graphics SDK 04.10.00.01 : AM335x sgx irq change
-This patch enables PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO for AM335x.
-This is required with 3.8 kernel onwards which uses DT.
-This will enable the path of getting sgx irq number dynamically.
-Signed-off-by: Prathap M S <msprathap@ti.com>
---
- services4/system/ti335x/syslocal.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/services4/system/ti335x/syslocal.h b/services4/system/ti335x/syslocal.h
-index 090b38d..222d52d 100644
--- a/services4/system/ti335x/syslocal.h
-+++ b/services4/system/ti335x/syslocal.h
-@@ -69,8 +69,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #if !defined(LDM_PLATFORM)
- #error "LDM_PLATFORM must be set"
- #endif
-//#define      PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO
-//#include <linux/platform_device.h>
-+#define        PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO
-+#include <linux/platform_device.h>
- #endif
- 
- #if ((defined(DEBUG) || defined(TIMING)) && \
-- 
-1.7.9.5
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch
deleted file mode 100644
index c553354..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/services4/srvkm/env/linux/module.c b/services4/srvkm/env/linux/module.c
-index 668dc2d..2247aad 100644
--- a/services4/srvkm/env/linux/module.c
-+++ b/services4/srvkm/env/linux/module.c
-@@ -84,6 +84,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include <linux/module.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-+#include <linux/of.h>
-+#endif
- 
- #if defined(SUPPORT_DRI_DRM)
- #include <drm/drmP.h>
-@@ -296,10 +299,24 @@ static struct platform_device_id powervr_id_table[] __devinitdata = {
- };
- #endif
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-+static const struct of_device_id omap_sgx_of_match[] = {
-+       {
-+               .compatible = "ti,sgx",
-+       },
-+       {},
-+};
-+MODULE_DEVICE_TABLE(of, omap_sgx_of_match);
-+#endif
-+
-+
- static LDM_DRV powervr_driver = {
- #if defined(PVR_LDM_PLATFORM_MODULE)
-        .driver = {
-                .name           = DRVNAME,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-+               .of_match_table = of_match_ptr(omap_sgx_of_match),
-+#endif
-        },
- #endif
- #if defined(PVR_LDM_PCI_MODULE)
-@@ -362,7 +379,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
- #endif
- {
-        SYS_DATA *psSysData;
-
-+       
-        PVR_TRACE(("PVRSRVDriverProbe(pDevice=%p)", pDevice));
- 
- #if 0   /* INTEGRATION_POINT */
-- 
-1.7.9.5
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch
deleted file mode 100644
index acef54b..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/services4/3rdparty/linux_drm/Kbuild b/services4/3rdparty/linux_drm/Kbuild
-index d01ef39..ccca3cd 100755
--- a/services4/3rdparty/linux_drm/Kbuild
-+++ b/services4/3rdparty/linux_drm/Kbuild
-@@ -26,38 +26,38 @@ endif
- endif
- 
- obj-m := drm.o
-ifeq ($(TI_PLATFORM),omap4)
-drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drawable.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
-       drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-       drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-       drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-       drm_crtc.o drm_modes.o drm_edid.o \
-       drm_info.o drm_debugfs.o drm_encoder_slave.o
-else
-+#ifeq ($(TI_PLATFORM),omap4)
-+#drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drawable.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
-+#      drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-+#      drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-+#      drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-+#      drm_crtc.o drm_modes.o drm_edid.o \
-+#      drm_info.o drm_debugfs.o drm_encoder_slave.o
-+#else
- # Works for 2.6.37 till 3.2 kernel
-drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
-       drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-       drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-       drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-       drm_crtc.o drm_modes.o drm_edid.o \
-       drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
-endif
-
-# For 3.3 kernel only
- #drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
- #      drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
- #      drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-#      drm_sysfs.o drm_hashtab.o drm_mm.o \
-+#      drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
- #      drm_crtc.o drm_modes.o drm_edid.o \
- #      drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
-+#endif
- 
-# For greater than/equal to 3.4 till 3.8 kernel
-+# For 3.3 kernel only
- #drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
- #      drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
- #      drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
- #      drm_sysfs.o drm_hashtab.o drm_mm.o \
- #      drm_crtc.o drm_modes.o drm_edid.o \
-#      drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o drm_prime.o
-+#      drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
-+
-+# For greater than/equal to 3.4 till 3.8 kernel
-+drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
-+       drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-+       drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-+       drm_sysfs.o drm_hashtab.o drm_mm.o \
-+       drm_crtc.o drm_modes.o drm_edid.o \
-+       drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o drm_prime.o
- 
- # less than 2.6.32 kernel
- 
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb
deleted file mode 100644
index b83e1ee..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-require recipes-ti/includes/ti-eula-unpack.inc
-SGXPV = "4_10_00_01"
-IMGPV = "1.9.2188537"
-inherit module
-MACHINE_KERNEL_PR_append = "c"
-PR = "${MACHINE_KERNEL_PR}"
-DEFAULT_PREFERENCE = "-1"
-# Select the corresponding hardfp/softfp filename and checksums based on tune flags
-BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
-MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
-SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
-BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
-MD5SUM_HARDFP = "15a3ccb66e98580e474fc112565f66b6"
-SHA256SUM_HARDFP = "4d94d5a1869b228ce12027783fc5425c92e9b66685c501247889f1f167e66c9d"
-BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
-    file://Change-for-interfacing-with-SGX-DT-node.patch \
-    file://linux-3.8.patch \
-    file://0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch \
-    "
-SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
-SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
-TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
-S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
-PVRBUILD = "release"
-export KERNELDIR = "${STAGING_KERNEL_DIR}"
-INHIBIT_PACKAGE_STRIP = "1"
-TI_PLATFORM_omap3 = "omap3630"
-TI_PLATFORM_ti814x = "ti81xx"
-TI_PLATFORM_ti816x = "ti81xx"
-TI_PLATFORM_ti33x = "ti335x"
-MODULESLOCATION_omap3 = "dc_omapfb3_linux"
-MODULESLOCATION_ti814x = "dc_ti81xx_linux"
-MODULESLOCATION_ti816x = "dc_ti81xx_linux"
-MODULESLOCATION_ti33x = "dc_ti335x_linux"
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
-MAKE_TARGETS_append_ti33x = " PM_RUNTIME=1"
-do_install() {
-    mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-    cp  ${S}/pvrsrvkm.ko \
-        ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko  \
-        ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
-        ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-}
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch b/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch
deleted file mode 100644
index 8c3ee2d..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c7edbae8c34f73abb1974c0e8722f6f3c7b49f45 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Tue, 17 Sep 2013 08:16:51 +0300
-Subject: [PATCH] am335x-evm: disable console cursor blinking
---
- include/configs/am335x_evm.h |    2 +
- 1 file changed, 2 insertion(++)
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 90e35ee..f28e842 100644
--- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -86,6 +86,8 @@
-        "ip_method=none\0" \
-        "bootargs_defaults=setenv bootargs " \
-                "console=${console} " \
-+               "consoleblank=0 " \
-+               "vt.global_cursor_default=0 " \
-                "${optargs}\0" \
-        "mmcargs=run bootargs_defaults;" \
-                "setenv bootargs ${bootargs} " \
-- 
-1.7.10.4
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
deleted file mode 100644
index a9c3c0d..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-am335x-evm-disable-console-cursor-blinking.patch \
-        "
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
deleted file mode 100644
index 25dd9e4..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bde714b9bfeafe46abc1078c09f6efac0e7b6478 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Wed, 22 Jan 2014 11:30:59 +0200
-Subject: [PATCH] BBB: disable console cursor blinking
---
- include/configs/am335x_evm.h | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index d53f17d..1b3d2a4 100644
--- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -59,6 +59,8 @@
-        "ramrootfstype=ext2\0" \
-        "mmcargs=setenv bootargs console=${console} " \
-                "${optargs} " \
-+               "consoleblank=0 " \
-+               "vt.global_cursor_default=0 " \
-                "root=${mmcroot} " \
-                "rootfstype=${mmcrootfstype}\0" \
-        "spiroot=/dev/mtdblock4 rw\0" \
-- 
-1.8.3.2
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
deleted file mode 100644
index b638ddc..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-BBB-disable-console-cursor-blinking.patch \
-        "
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
deleted file mode 100644
index 06eb3c7..0000000
--- a/meta-toradex-extras/conf/layer.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# 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_toradex"
-BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_toradex = "20"
diff --git a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab b/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
deleted file mode 100644
index 12e0489..0000000
--- a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
+++ /dev/null
@@ -1,15 +0,0 @@
-# stock fstab - you probably want to override this with a machine specific one
-/dev/root            /                    auto       defaults              1  1
-proc                 /proc                proc       defaults              0  0
-debugfs              /sys/kernel/debug    debugfs    defaults              0  0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-usbfs                /proc/bus/usb        usbfs      noauto
-tmpfs                /var/volatile        tmpfs      defaults              0  0
-tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
-tmpfs                /dev/shm             tmpfs      mode=0777             0  0
-tmpfs                /media/ram           tmpfs      defaults              0  0
-# uncomment this if your device has a SD/MMC/Transflash slot
-#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
deleted file mode 100644
index 43edec3..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001
-From: Andy Nichols <andy.nichols@theqtcompany.com>
-Date: Wed, 18 Feb 2015 14:28:14 +0100
-Subject: [PATCH] Allow builds with GCC 4.8
---
- arch/arm/kernel/asm-offsets.c | 4 ----
- 1 file changed, 4 deletions(-)
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 2d2d608..6f8e79c 100644
--- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -49,10 +49,6 @@
- #error Your compiler is too buggy; it is known to miscompile kernels.
- #error    Known good compilers: 3.3, 4.x
- #endif
-#if GCC_VERSION >= 40800 && GCC_VERSION < 40803
-#error Your compiler is too buggy; it is known to miscompile kernels
-#error and result in filesystem corruption and oopses.
-#endif
- #endif
- 
- int main(void)
-- 
-1.9.1
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
deleted file mode 100644
index d92ac62..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001
-From: Andy Nichols <andy.nichols@theqtcompany.com>
-Date: Fri, 6 Mar 2015 10:14:13 +0100
-Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller
---
- arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-index 1f43dbe..9194580 100644
--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-@@ -214,7 +214,7 @@
-                gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */
-                         &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */
-                        >;
-               status = "disabled";
-+               status = "okay";
-        };
- 
-        /* M41T0M6 real time clock on carrier board */
-- 
-2.3.1
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
deleted file mode 100644
index 5352ed7..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-# kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
-config_script () {
-    # FunctionFS for adb
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
-    echo "CONFIG_USB_ACM=m"         >> ${S}/.config
-}
-B = "${S}"
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
deleted file mode 100644
index 501ad33..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/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
deleted file mode 100644
index b54a4ae..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/0002-colibri-vf-fix-mmc-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
deleted file mode 100644
index 25476dd..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index ec3125b..ed7c8dc 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -56,7 +56,6 @@ RDEPENDS_${PN} += " \
    qtimageformats-dev \
    qtlocation-dev \
    qtmultimedia-dev \
-    qtotaupdate-dev \
    qtquickcontrols-dev \
    qtquickcontrols2-dev \
    qtsensors-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index c63ddb8..7d7160d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -49,7 +49,6 @@ RDEPENDS_${PN} += " \
    qtimageformats \
    qtlocation \
    qtmultimedia \
-    qtotaupdate \
    qtquickcontrols \
    qtquickcontrols2 \
    qtsensors \
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch b/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch
deleted file mode 100644
index f67a840..0000000
--- a/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
-index 0f5b362..94d03a3 100644
--- a/gst/volume/gstvolume.c
-+++ b/gst/volume/gstvolume.c
-@@ -250,10 +250,14 @@ volume_update_volume (GstVolume * self, const GstAudioInfo * info,
-     self->current_mute = FALSE;
-     self->current_volume = volume;
- 
-    self->current_vol_i8 = volume * VOLUME_UNITY_INT8;
-    self->current_vol_i16 = volume * VOLUME_UNITY_INT16;
-    self->current_vol_i24 = volume * VOLUME_UNITY_INT24;
-    self->current_vol_i32 = volume * VOLUME_UNITY_INT32;
-+    self->current_vol_i8 =
-+        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8);
-+    self->current_vol_i16 =
-+        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16);
-+    self->current_vol_i24 =
-+        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24);
-+    self->current_vol_i32 =
-+        (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32);
- 
-     passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16);
-   }
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
deleted file mode 100644
index 646faa5..0000000
--- a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://fix-gstvolume.patch"
diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb
deleted file mode 100644
index 0e14055..0000000
--- a/recipes/libgsystem/libgsystem.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-SUMMARY = "LibGSystem is a GIO-based library, targeted primarily for use by operating system components."
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-inherit autotools pkgconfig
-SRC_URI = "gitsm://github.com/GNOME/libgsystem.git;protocol=git"
-SRCREV = "86c24c181ec6c3ec334a39145efc022c3e744929"
-S = "${WORKDIR}/git"
-DEPENDS = "glib-2.0 attr libcap"
-do_configure_prepend() {
-    # Workaround a broken configure.ac. It should check first if GTK_DOC_CHECK
-    # macro is actually defined before trying to use it. For how-to see:
-    # https://developer.gnome.org/gtk-doc-manual/stable/settingup_autoconf.html.en
-    # We get a syntax error since we do not bundle gnome recipes that define this macro.
-    sed -i '/GTK_DOC_CHECK/d' ${S}/configure.ac
-}
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 6e79395..75d5bd5 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -35,19 +35,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 inherit autotools pkgconfig systemd
 SRC_URI = " \
-    git://github.com/GNOME/ostree.git \
+    git://github.com/ostreedev/ostree.git \
-    file://Fix-enable_rofiles_fuse-no-build.patch \
    file://Mount-boot-partition.patch \
+    file://ostree-prepare-root-enabler-for-simpler-kernel-arg.patch \
+    file://deploy-add-karg-none-argument.patch \
+    file://Support-for-booting-without-initramfs.patch \
    file://Allow-updating-files-in-the-boot-directory.patch \
-    file://u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://u-boot-add-bootdir-to-the-generated-uEnv.txt.patch \
    file://Create-firmware-convenience-symlinks.patch \
    "
-SRCREV = "v2016.5"
+SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
 S = "${WORKDIR}/git"
-DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz systemd"
+DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
 # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
 # The production image do not require bash for proper working.
 RDEPENDS_${PN} += "bash"
@@ -68,6 +70,8 @@ EXTRA_OECONF = "--with-dracut \
                --enable-gtk-doc-html=no \
                --enable-man=no \
                --with-soup \
+                --with-static-prepare-root \
+                --disable-otmpfile \
                --enable-libsoup-client-certs"
 do_configure_prepend() {
diff --git a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
index ffcc77c..d416543 100644
--- a/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
+++ b/recipes/ostree/ostree/Allow-updating-files-in-the-boot-directory.patch
@@ -1,34 +1,90 @@
-From 7f4549c6e94494460be06311c3a4d23ae684ab21 Mon Sep 17 00:00:00 2001
+From cc31c80658a90cf1b13fdf9fe8b6dde1cc9a0d24 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+From: Gatis Paeglis <gatis.paeglis@qt.io>
-Date: Wed, 20 Apr 2016 13:58:27 +0200
+Date: Mon, 22 Aug 2016 11:32:16 +0200
-Subject: [PATCH 1/3] Allow updating files in the /boot directory.
+Subject: [PATCH 1/3] Allow updating files in the /boot directory
-Until now OSTree copied only the vmlinuz and initramfs
+This patch adds support for copying (or hardlinking on
-binaries to the boot/ directory (which in some setups
+single partition systems) all files from the deployment's
-might be on a separate partition). This patch adds
+/usr/lib/ostree-boot directory to the relevant
-support for copying other files from the deployment's
+/boot/ostree/$os-$bootcsum/ directory. This feature can
-/boot directory to the real /boot.
+be enabled by 'touch .ostree-bootcsumdir-source' in
+/usr/lib/ostree-boot.
-How this works:
-Ignore subdirectories, only files in root of the boot
-directory are copied. There is overhead of copying files
-to boot/, therefore the amount of files in boot/ should
-be kept to the minimum and subdirectories shouldn't
-really be necessary.
-Files in the boot/ directory are updated only with major
-releases, when kernel/initramfs bootcsum changes. Files
-that require frequent updates should not be stored here.
 ---
- src/libostree/ostree-sysroot-deploy.c | 52 +++++++++++++++++++++++++++++++++++
+ src/libostree/ostree-sysroot-deploy.c | 101 +++++++++++++++++++++++++++++++---
- 1 file changed, 52 insertions(+)
+ 1 file changed, 94 insertions(+), 7 deletions(-)
 diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index 8877236..8cf080e 100644
+index a05ca30..f34e3f3 100644
 --- a/src/libostree/ostree-sysroot-deploy.c
 +++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -1295,6 +1295,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+@@ -165,12 +165,31 @@ dirfd_copy_attributes_and_xattrs (int            src_parent_dfd,
+ }
+ 
+ static gboolean
+hardlink_or_copy_dir_recurse (int  src_parent_dfd,
+                  int              dest_parent_dfd,
+                  const char      *name,
+                  gboolean         hardlink,
+                  GCancellable    *cancellable,
+                  GError         **error);
+
+static gboolean
+ copy_dir_recurse (int              src_parent_dfd,
+                   int              dest_parent_dfd,
+                   const char      *name,
+                   GCancellable    *cancellable,
+                   GError         **error)
+ {
+    return hardlink_or_copy_dir_recurse (src_parent_dfd, dest_parent_dfd, name, FALSE, cancellable, error);
+}
+
+static gboolean
+hardlink_or_copy_dir_recurse (int  src_parent_dfd,
+                  int              dest_parent_dfd,
+                  const char      *name,
+                  gboolean         hardlink,
+                  GCancellable    *cancellable,
+                  GError         **error)
+{
+   g_auto(GLnxDirFdIterator) src_dfd_iter = { 0, };
+   glnx_fd_close int dest_dfd = -1;
+   struct dirent *dent;
+@@ -210,17 +229,27 @@ copy_dir_recurse (int              src_parent_dfd,
+ 
+       if (S_ISDIR (child_stbuf.st_mode))
+         {
+-          if (!copy_dir_recurse (src_dfd_iter.fd, dest_dfd, dent->d_name,
+-                                 cancellable, error))
+          if (!hardlink_or_copy_dir_recurse (src_dfd_iter.fd, dest_dfd, dent->d_name,
+                                             hardlink, cancellable, error))
+             return FALSE;
+         }
+       else
+         {
+-          if (!glnx_file_copy_at (src_dfd_iter.fd, dent->d_name, &child_stbuf,
+-                                  dest_dfd, dent->d_name,
+-                                  GLNX_FILE_COPY_OVERWRITE,
+-                                  cancellable, error))
+-            return FALSE;
+          if (hardlink)
+            {
+              if (!hardlink_or_copy_at (src_dfd_iter.fd, dent->d_name,
+                                        dest_dfd, dent->d_name,
+                                        cancellable, error))
+                return FALSE;
+            }
+          else
+            {
+              if (!glnx_file_copy_at (src_dfd_iter.fd, dent->d_name, &child_stbuf,
+                                      dest_dfd, dent->d_name,
+                                      GLNX_FILE_COPY_OVERWRITE,
+                                      cancellable, error))
+                return FALSE;
+            }
+         }
+     }
+ 
+@@ -1301,6 +1330,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
   g_autofree char *version_key = NULL;
   g_autofree char *ostree_kernel_arg = NULL;
   g_autofree char *options_key = NULL;
@@ -36,60 +92,66 @@ index 8877236..8cf080e 100644
   GString *title_key;
   __attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
   const char *val;
-@@ -1361,6 +1362,57 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+@@ -1367,6 +1397,63 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
         }
     }
 
-+
+  if (fstatat (tree_boot_dfd, ".ostree-bootcsumdir-source", &stbuf, 0) == 0)
-+  /* Copy other files that are stored in deployment's /usr/lib/ostree-boot. Lets keep this simple:
-+   *
-+   * - Ignore subdirectories. Only files in root of the /usr/lib/ostree-boot directory are copied.
-+   *   There is an overhead of copying files to boot/, therefore the amount of files in a deployment's
-+   *   usr/lib/ostree-boot should be kept to the minimum and subdirectories shouldn't really
-+   *   be necessary.
-+   *
-+   * - Files in /boot are updated only with major releases, when kernel/initramfs
-+   *   bootcsum changes. Files that require frequent updates should not be stored here.
-+   */
-+  if (!glnx_dirfd_iterator_init_take_fd (dup (tree_boot_dfd), &dfd_iter, error))
-+    goto out;
-+
-+  while (TRUE)
 +    {
-+      struct dirent *dent;
+      if (!glnx_dirfd_iterator_init_at (tree_boot_dfd, ".", FALSE, &dfd_iter, error))
-+
-+      if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
 +        goto out;
 +
-+      if (dent == NULL)
+      while (TRUE)
-+        break;
-+
-+      if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0) != 0)
 +        {
-+          if (errno == ENOENT)
+          struct dirent *dent;
-+              continue;
-+          glnx_set_error_from_errno (error);
-+          goto out;
-+        }
 +
-+      if (g_str_has_prefix (dent->d_name, "vmlinuz-") || g_str_has_prefix (dent->d_name, "initramfs-")
+          if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
-+              || !S_ISREG(stbuf.st_mode))
+            goto out;
-+        continue;
+          if (dent == NULL)
+            break;
 +
-+      if (fstatat (bootcsum_dfd, dent->d_name, &stbuf, 0) != 0)
+          /* Skip special files - vmlinuz-* and initramfs-* are handled separately */
-+        {
+          if (g_str_has_prefix (dent->d_name, "vmlinuz-") || g_str_has_prefix (dent->d_name, "initramfs-"))
-+          if (errno != ENOENT)
+            continue;
+
+          if (fstatat (bootcsum_dfd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
 +            {
-+              glnx_set_prefix_error_from_errno (error, "fstat %s", dent->d_name);
+              if (errno != ENOENT)
-+              goto out;
+                {
+                  glnx_set_prefix_error_from_errno (error, "fstatat %s", dent->d_name);
+                  goto out;
+                }
+
+              if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
+                {
+                  glnx_set_error_from_errno (error);
+                  goto out;
+                }
+
+              if (S_ISDIR (stbuf.st_mode))
+                {
+                  if (!hardlink_or_copy_dir_recurse (tree_boot_dfd, bootcsum_dfd, dent->d_name,
+                                                     TRUE, cancellable, error))
+                    goto out;
+                }
+              else
+                {
+                  if (!hardlink_or_copy_at (tree_boot_dfd, dent->d_name,
+                                            bootcsum_dfd, dent->d_name,
+                                            cancellable, error))
+                    goto out;
+                }
 +            }
-+          if (!glnx_file_copy_at (tree_boot_dfd, dent->d_name, &stbuf,
-+                                  bootcsum_dfd, dent->d_name, 0,
-+                                  cancellable, error))
-+            goto out;
 +        }
 +    }
-+
+  else
+    {
+      if (errno != ENOENT)
+        {
+          glnx_set_prefix_error_from_errno (error, "fstatat %s", ".ostree-bootcsumdir-source");
+          goto out;
+        }
+    }
 +
   if (fstatat (deployment_dfd, "usr/lib/os-release", &stbuf, 0) != 0)
     {
diff --git a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
index 960367c..656887d 100644
--- a/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
+++ b/recipes/ostree/ostree/Create-firmware-convenience-symlinks.patch
@@ -1,44 +1,42 @@
-From 310ddd84dc353d93a2cc118725b459dba643cf0b Mon Sep 17 00:00:00 2001
+From c4df63488b9e09a9aa69e32ea5c0671c9dc50c9d Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+From: Gatis Paeglis <gatis.paeglis@qt.io>
-Date: Thu, 21 Apr 2016 16:54:05 +0200
+Date: Wed, 24 Aug 2016 12:29:38 +0200
-Subject: [PATCH 3/3] Create firmware convenience symlinks.
+Subject: [PATCH] Create firmware convenience symlinks.
 Later this could be moved into utils or a similar
 location, if other boot loader backends will need
 this functionality.
 ---
- src/libostree/ostree-bootloader-uboot.c | 97 ++++++++++++++++++++++++++++++++-
+ src/libostree/ostree-bootloader-uboot.c | 93 ++++++++++++++++++++++++++++++++-
- 1 file changed, 96 insertions(+), 1 deletion(-)
+ 1 file changed, 92 insertions(+), 1 deletion(-)
 diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index 9bcde9c..be5e8c5 100644
+index 22251da..26a3127 100644
 --- a/src/libostree/ostree-bootloader-uboot.c
 +++ b/src/libostree/ostree-bootloader-uboot.c
-@@ -66,6 +66,100 @@ _ostree_bootloader_uboot_get_name (OstreeBootloader *bootloader)
+@@ -62,6 +62,97 @@ _ostree_bootloader_uboot_get_name (OstreeBootloader *bootloader)
   return "U-Boot";
 }
 
 +/* It is common for firmware to search / on the boot partition for additional
 + * files that are required for booting. It can be difficult to change this search
 + * logic if it is hardcoded somewhere low in the stack or is in a read-only memory.
-+ * This issue can be solved from the OS installer, by creating a symlink in the
+ * This issue can be solved by system builders by creating a convenience symlink:
-+ * following way:
 + *
 + *    cd sysroot/boot
 + *    ln -s loader/second-stage-bootloader second-stage-bootloader
 + *
 + * This function will make sure that loader/second-stage-bootloader points to the
 + * correct target file version. This function does nothing if boot/ does not contain
-+ * symlink files pointing into loader/.
+ * symlink files pointing into the loader/ directory.
 + */
 +static gboolean
-+create_firmware_convenience_symlinks (OstreeBootloaderUboot     *self,
+create_firmware_convenience_symlinks (OstreeBootloaderUboot *self,
 +                                      char                  *bootcsum_dir,
 +                                      int                    bootversion,
 +                                      GCancellable          *cancellable,
 +                                      GError               **error)
 +{
-+  gboolean ret = FALSE;
 +  glnx_fd_close int loader_dfd = -1;
 +  glnx_fd_close int boot_dfd = -1;
 +  g_autofree char *loader_dir = NULL;
@@ -46,18 +44,18 @@ index 9bcde9c..be5e8c5 100644
 +
 +  loader_dir = g_strdup_printf ("boot/loader.%d/", bootversion);
 +  if (!glnx_opendirat (self->sysroot->sysroot_fd, loader_dir, FALSE, &loader_dfd, error))
-+    goto out;
+    return FALSE;
 +  if (!glnx_opendirat (self->sysroot->sysroot_fd, "boot", FALSE, &boot_dfd, error))
-+    goto out;
+    return FALSE;
 +  if (!glnx_dirfd_iterator_init_take_fd (dup (boot_dfd), &dfd_iter, error))
-+    goto out;
+    return FALSE;
 +
 +  while (TRUE) {
 +    struct dirent *dent;
 +    struct stat stbuf;
 +
 +    if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
-+      goto out;
+      return FALSE;
 +    if (dent == NULL)
 +      break;
 +
@@ -66,7 +64,7 @@ index 9bcde9c..be5e8c5 100644
 +        if (errno == ENOENT)
 +          continue;
 +        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "fstatat");
-+        goto out;
+        return FALSE;
 +      }
 +
 +    if (S_ISLNK(stbuf.st_mode))
@@ -87,44 +85,42 @@ index 9bcde9c..be5e8c5 100644
 +                if (errno == ENOENT)
 +                  continue;
 +                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "faccessat");
-+                goto out;
+                return FALSE;
 +              }
 +
-+            /* In case 'ostree admin cleanup' was not run after an interrupted deployment */
+            /* Cleanup from stray symlinks. This can happend when the previous deployment was
+               interrupted and no cleanup routines were run before restaring the deployment. */
 +            if (unlinkat (loader_dfd, dent->d_name, 0) == -1 && errno != ENOENT)
 +            {
 +              g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unlinkat");
-+              goto out;
+              return FALSE;
 +            }
-+            /* Complete the link chain to the current boot file version */
+            /* Complete the link chain to the current boot file version. */
 +            snprintf (path_buffer, sizeof(path_buffer), "..%s/%s", bootcsum_dir, dent->d_name);
 +            if (symlinkat (path_buffer, loader_dfd, dent->d_name) == -1)
 +              {
 +                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "symlinkat");
-+                goto out;
+                return FALSE;
 +              }
 +          }
 +      }
 +  }
 +
-+  ret = TRUE;
+  return TRUE;
-+out:
-+  return ret;
 +}
 +
 static gboolean
 create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
                                         int                    bootversion,
-@@ -130,7 +224,8 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+@@ -138,7 +229,7 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
         }
     }
 
-  ret = TRUE;
+-  return TRUE;
-+  ret = create_firmware_convenience_symlinks (self, bootdir, bootversion, cancellable, error);
+  return create_firmware_convenience_symlinks (self, bootdir, bootversion, cancellable, error);
-+
- out:
-   return ret;
 }
+ 
+ static gboolean
 -- 
 2.7.4
diff --git a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch b/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
deleted file mode 100644
index 480fc21..0000000
--- a/recipes/ostree/ostree/Fix-enable_rofiles_fuse-no-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b54643153cade28523cccee44fdddea2c94e0684 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Mon, 25 Apr 2016 13:57:03 +0200
-Subject: [PATCH] Fix --enable_rofiles_fuse=no build
---
- Makefile.am  | 2 ++
- configure.ac | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-diff --git a/Makefile.am b/Makefile.am
-index 488d4b6..e49b7c5 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -71,7 +71,9 @@ include Makefile-otutil.am
- include Makefile-libostree.am
- include Makefile-ostree.am
- include Makefile-switchroot.am
-+if BUILDOPT_FUSE
- include src/rofiles-fuse/Makefile-inc.am
-+endif
- include Makefile-tests.am
- include Makefile-boot.am
- include Makefile-man.am
-diff --git a/configure.ac b/configure.ac
-index dca9f53..6af60e8 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
-               [AS_HELP_STRING([--enable-rofiles-fuse],
-                               [generate rofiles-fuse helper [default=yes]])],,
-               enable_rofiles_fuse=yes)
-AS_IF([ test $enable_rofiles_fuse != xno ], [
-+AS_IF([ test x$enable_rofiles_fuse != xno ], [
-     PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
- ], [enable_rofiles_fuse=no])
- AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)
-- 
-2.7.4
diff --git a/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch b/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch
new file mode 100644
index 0000000..4ec137f
--- /dev/null
+++ b/recipes/ostree/ostree/Support-for-booting-without-initramfs.patch
@@ -0,0 +1,131 @@
+From a31c9083870fd934e242cc9cc56fdd39ad0a42cb Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Wed, 24 Aug 2016 12:00:14 +0200
+Subject: [PATCH 3/4] Support for booting without initramfs
+Previously when initramfs-* was not found in a deployment's
+boot directory, it was assumed that rootfs is prepared for
+ostree booting by a kernel patch.
+With this patch, the behaviour changes to be - if initramfs-*
+is not found, assume that system is using a static
+ostree-prepare-root as init process. Booting without initramfs
+is a common use case on embedded systems. This approach is
+also more convenient, than having to patch the kernel.
+---
+ Makefile-switchroot.am                |  3 +++
+ configure.ac                          |  8 ++++++++
+ src/boot/grub2/ostree-grub-generator  |  8 +++++---
+ src/libostree/ostree-sysroot-deploy.c | 18 +++++++++++++-----
+ 4 files changed, 29 insertions(+), 8 deletions(-)
+diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am
+index ef837ce..70a6de7 100644
+--- a/Makefile-switchroot.am
+++ b/Makefile-switchroot.am
+@@ -29,6 +29,9 @@ libswitchroot_mountutil_la_SOURCES = \
+ ostree_prepare_root_SOURCES = src/switchroot/ostree-prepare-root.c
+ ostree_prepare_root_LDADD = libswitchroot-mountutil.la
+ ostree_prepare_root_CFLAGS = $(AM_CFLAGS) -Isrc/switchroot
+if BUILDOPT_STATIC_PREPARE_ROOT
+ostree_prepare_root_LDFLAGS = --static
+endif
+ 
+ ostree_remount_SOURCES = src/switchroot/ostree-remount.c
+ ostree_remount_LDADD = libswitchroot-mountutil.la
+diff --git a/configure.ac b/configure.ac
+index 4831bcc..97f3112 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -294,6 +294,13 @@ AS_IF([test x$with_grub2_mkconfig_path = x], [
+ ],[GRUB2_MKCONFIG=$with_grub2_mkconfig_path])
+ AC_DEFINE_UNQUOTED([GRUB2_MKCONFIG_PATH], ["$GRUB2_MKCONFIG"], [The system grub2-mkconfig executible name])
+ 
+AC_ARG_WITH(static-prepare-root,
+            AS_HELP_STRING([--with-static-prepare-root],
+                           [Build static version of the 'ostree-prepare-root' binary. Useful when
+                            using 'ostree-prepare-root' as the init (PID 1) process. (default: no)]),,
+              [with_static_prepare_root=no])
+AM_CONDITIONAL(BUILDOPT_STATIC_PREPARE_ROOT, test x$with_static_prepare_root = xyes)
+
+ dnl for tests
+ AS_IF([test "x$found_introspection" = xyes], [
+   AC_PATH_PROG(GJS, [gjs])
+@@ -327,6 +334,7 @@ echo "
+     libarchive (parse tar files directly):        $with_libarchive
+     static deltas:                                yes (always enabled now)
+     O_TMPFILE:                                    $enable_otmpfile
+    static ostree-prepare-root                    $with_static_prepare_root
+     man pages (xsltproc):                         $enable_man
+     api docs (gtk-doc):                           $enable_gtk_doc
+     gjs-based tests:                              $have_gjs
+diff --git a/src/boot/grub2/ostree-grub-generator b/src/boot/grub2/ostree-grub-generator
+index 5673b26..ceca806 100644
+--- a/src/boot/grub2/ostree-grub-generator
+++ b/src/boot/grub2/ostree-grub-generator
+@@ -28,7 +28,7 @@ entries_path=$(dirname $new_grub2_cfg)/entries
+ 
+ read_config()
+ {
+-    config_file=${entries_path}/${1}
+    config_file=${1}
+     title=""
+     initrd=""
+     options=""
+@@ -62,11 +62,13 @@ read_config()
+ populate_menu()
+ {
+     boot_prefix="${OSTREE_BOOT_PARTITION}"
+-    for config in $(ls ${entries_path}); do
+    for config in $(ls $entries_path/*.conf); do
+         read_config ${config}
+         menu="${menu}menuentry '${title}' {\n"
+         menu="${menu}\t linux ${boot_prefix}${linux} ${options}\n"
+-        menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
+        if [ -n "${initrd}" ] ; then
+            menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
+        fi
+         menu="${menu}}\n\n"
+     done
+     # The printf command seems to be more reliable across shells for special character (\n, \t) evaluation
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index a05ca30..c0a0347 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -1458,20 +1458,28 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+     ostree_bootconfig_parser_set (bootconfig, "linux", boot_relpath);
+   }
+ 
+  val = ostree_bootconfig_parser_get (bootconfig, "options");
+  kargs = _ostree_kernel_args_from_string (val);
+
+   if (dest_initramfs_name)
+     {
+       g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", dest_initramfs_name, NULL);
+       ostree_bootconfig_parser_set (bootconfig, "initrd", boot_relpath);
+     }
+-
+-  val = ostree_bootconfig_parser_get (bootconfig, "options");
+  else
+    {
+      g_autofree char *prepare_root_arg = NULL;
+      prepare_root_arg = g_strdup_printf ("init=/ostree/boot.%d/%s/%s/%d/usr/lib/ostree/ostree-prepare-root",
+                                             new_bootversion, osname, bootcsum,
+                                             ostree_deployment_get_bootserial (deployment));
+      _ostree_kernel_args_replace_take (kargs, g_steal_pointer (&prepare_root_arg));
+    }
+ 
+   ostree_kernel_arg = g_strdup_printf ("ostree=/ostree/boot.%d/%s/%s/%d",
+                                        new_bootversion, osname, bootcsum,
+                                        ostree_deployment_get_bootserial (deployment));
+-  kargs = _ostree_kernel_args_from_string (val);
+-  _ostree_kernel_args_replace_take (kargs, ostree_kernel_arg);
+-  ostree_kernel_arg = NULL;
+  _ostree_kernel_args_replace_take (kargs, g_steal_pointer (&ostree_kernel_arg));
+
+   options_key = _ostree_kernel_args_to_string (kargs);
+   ostree_bootconfig_parser_set (bootconfig, "options", options_key);
+   
+-- 
+2.7.4
diff --git a/recipes/ostree/ostree/deploy-add-karg-none-argument.patch b/recipes/ostree/ostree/deploy-add-karg-none-argument.patch
new file mode 100644
index 0000000..5eaf68f
--- /dev/null
+++ b/recipes/ostree/ostree/deploy-add-karg-none-argument.patch
@@ -0,0 +1,62 @@
+From 9ca3a2cc64bc709649d0d756fa715aaef807dca8 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Fri, 12 Aug 2016 11:51:04 +0200
+Subject: [PATCH 2/4] deploy: add --karg-none argument
+If the current deployment has "rootwait root=/dev/sda2",
+but the new deployment does not need "rootwait" anymore,
+there is no way to clear this arg at the moment (as opposed
+to "karg=root=", which overrides any earlier argument with
+the same name). With "--karg-none" users can now clear all
+the previous args and set new "root=":
+ostree admin deploy --karg-none --karg=root=LABEL=rootfs
+---
+ src/ostree/ot-admin-builtin-deploy.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
+index c66c9b3..420efa3 100644
+--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
+@@ -38,6 +38,7 @@ static char **opt_kernel_argv_append;
+ static gboolean opt_kernel_proc_cmdline;
+ static char *opt_osname;
+ static char *opt_origin_path;
+static gboolean opt_kernel_arg_none;
+ 
+ static GOptionEntry options[] = {
+   { "os", 0, 0, G_OPTION_ARG_STRING, &opt_osname, "Use a different operating system root than the current one", "OSNAME" },
+@@ -46,6 +47,7 @@ static GOptionEntry options[] = {
+   { "karg-proc-cmdline", 0, 0, G_OPTION_ARG_NONE, &opt_kernel_proc_cmdline, "Import current /proc/cmdline", NULL },
+   { "karg", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_kernel_argv, "Set kernel argument, like root=/dev/sda1; this overrides any earlier argument with the same name", "NAME=VALUE" },
+   { "karg-append", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_kernel_argv_append, "Append kernel argument; useful with e.g. console= that can be used multiple times", "NAME=VALUE" },
+  { "karg-none", 0, 0, G_OPTION_ARG_NONE, &opt_kernel_arg_none, "Do not import kernel arguments", NULL },
+   { NULL }
+ };
+ 
+@@ -77,6 +79,12 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro
+       goto out;
+     }
+ 
+  if (opt_kernel_proc_cmdline && opt_kernel_arg_none)
+  {
+    ot_util_usage_error (context, "Can't specify both --karg-proc-cmdline and --karg-none", error);
+    goto out;
+  }
+
+   refspec = argv[1];
+ 
+   if (!ostree_sysroot_load (sysroot, cancellable, error))
+@@ -135,7 +143,7 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro
+       if (!_ostree_kernel_args_append_proc_cmdline (kargs, cancellable, error))
+         goto out;
+     }
+-  else if (merge_deployment)
+  else if (merge_deployment && !opt_kernel_arg_none)
+     {
+       OstreeBootconfigParser *bootconfig = ostree_deployment_get_bootconfig (merge_deployment);
+       g_auto(GStrv) previous_args = g_strsplit (ostree_bootconfig_parser_get (bootconfig, "options"), " ", -1);
+-- 
+2.7.4
diff --git a/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch b/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
new file mode 100644
index 0000000..2800618
--- /dev/null
+++ b/recipes/ostree/ostree/ostree-prepare-root-enabler-for-simpler-kernel-arg.patch
@@ -0,0 +1,54 @@
+From d183819e6e7bdc7a9476542cbef384285f592f3f Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Fri, 12 Aug 2016 08:50:29 +0200
+Subject: [PATCH 1/4] ostree-prepare-root: enabler for simpler kernel arg
+With the current approach, when ostree-prepare-root is used
+on the kernel command line as init=, it always assumes that
+the next value in the argument list is a path to the sysroot.
+The code for falling back to a default path (if none is provided),
+would only work if init= is the last arg in the argument list.
+We can not rely on that and have to explicitly provide the
+path to the sysroot. Which defeats the purpose of a default
+path selection code.
+To keep command line neater assume that sysroot is on / when
+using ostree-prepare-root as init. This probably is what most
+people want anyways. Also _ostree_kernel_args* API assumes
+that args are space separated list. Which is problematic for:
+"init=${ostree}/usr/lib/ostree/ostree-prepare-root /" as it
+gets split in two.
+---
+ src/switchroot/ostree-prepare-root.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
+index 895b2e5..449fc33 100644
+--- a/src/switchroot/ostree-prepare-root.c
+++ b/src/switchroot/ostree-prepare-root.c
+@@ -199,10 +199,19 @@ main(int argc, char *argv[])
+   char srcpath[PATH_MAX];
+   struct stat stbuf;
+ 
+-  if (argc < 2)
+-    root_mountpoint = "/";
+  if (getpid() == 1)
+    {
+      root_mountpoint = "/";
+    }
+   else
+-    root_mountpoint = argv[1];
+    {
+      if (argc < 2)
+        {
+          fprintf (stderr, "usage: ostree-prepare-root SYSROOT\n");
+          exit (EXIT_FAILURE);
+        }
+      root_mountpoint = argv[1];
+    }
+ 
+   root_mountpoint = realpath (root_mountpoint, NULL);
+   deploy_path = resolve_deploy_path (root_mountpoint);
+-- 
+2.7.4
diff --git a/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch b/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
deleted file mode 100644
index 501f8d4..0000000
--- a/recipes/ostree/ostree/u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 86184e5a266b087ba222b03141b491241e27e284 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Thu, 21 Apr 2016 14:28:38 +0200
-Subject: [PATCH 2/3] u-boot: Merge ostree's and systems uEnv.txt
-This allow for simpler u-boot scripts and is a proper
-fix for: https://bugzilla.gnome.org/show_bug.cgi?id=755787
-With this patch admin can now:
-1) Edit /usr/lib/ostree-boot/uEnv.txt
-2) Download the update to a target. And during the deploy
-   process OSTree will prepend its env (loader/uEnv.txt)
-   to the system's uEnv.txt
---
- src/libostree/ostree-bootloader-uboot.c | 41 ++++++++++++++++++++++++++++++---
- 1 file changed, 38 insertions(+), 3 deletions(-)
-diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
-index f67e9bd..9bcde9c 100644
--- a/src/libostree/ostree-bootloader-uboot.c
-+++ b/src/libostree/ostree-bootloader-uboot.c
-@@ -29,6 +29,10 @@
- #include "otutil.h"
- 
- #include <string.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <fcntl.h>
- 
- struct _OstreeBootloaderUboot
- {
-@@ -69,13 +73,17 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-                                         GCancellable          *cancellable,
-                                         GError               **error)
- {
-+  gboolean ret = FALSE;
-   g_autoptr(GPtrArray) boot_loader_configs = NULL;
-   OstreeBootconfigParser *config;
-   const char *val;
-+  g_autofree char *bootdir = NULL;
-+  g_autoptr(GFile) uenv_file = NULL;
-+  char uenv_path[PATH_MAX];
- 
-   if (!_ostree_sysroot_read_boot_loader_configs (self->sysroot, bootversion, &boot_loader_configs,
-                                                  cancellable, error))
-    return FALSE;
-+    goto out;
- 
-   /* U-Boot doesn't support a menu so just pick the first one since the list is ordered */
-   config = boot_loader_configs->pdata[0];
-@@ -85,10 +93,13 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-     {
-       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                    "No \"linux\" key in bootloader config");
-      return FALSE;
-+      goto out;
-     }
-   g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image=%s", val));
- 
-+  bootdir = strndup (val, strrchr(val, '/') - val);
-+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s/", bootdir));
-+
-   val = ostree_bootconfig_parser_get (config, "initrd");
-   if (val)
-     g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image=%s", val));
-@@ -97,7 +108,31 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
-   if (val)
-     g_ptr_array_add (new_lines, g_strdup_printf ("bootargs=%s", val));
- 
-  return TRUE;
-+  /* Append user's uEnv.txt if it exists */
-+  snprintf (uenv_path, sizeof(uenv_path), "boot/%s/uEnv.txt", bootdir);
-+  uenv_file = g_file_get_child (self->sysroot->path, uenv_path);
-+  if (g_file_query_exists (uenv_file, cancellable))
-+    {
-+      g_autoptr(GInputStream) instream = NULL;
-+      g_autoptr(GDataInputStream) datastream = NULL;
-+      gsize len;
-+      instream = (GInputStream*)g_file_read (uenv_file, cancellable, error);
-+      if (!instream)
-+        goto out;
-+
-+      datastream = g_data_input_stream_new (instream);
-+      while (TRUE)
-+        {
-+          val = g_data_input_stream_read_line (datastream, &len, cancellable, error);
-+          if (!val)
-+            break;
-+          g_ptr_array_add (new_lines, (char *)val);
-+        }
-+    }
-+
-+  ret = TRUE;
-+out:
-+  return ret;
- }
- 
- static gboolean
-- 
-2.7.4
diff --git a/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch b/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
new file mode 100644
index 0000000..e8c8f16
--- /dev/null
+++ b/recipes/ostree/ostree/u-boot-add-bootdir-to-the-generated-uEnv.txt.patch
@@ -0,0 +1,52 @@
+From 8323c038733522f7f31fefc8921b7c1760416638 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Mon, 22 Aug 2016 15:52:21 +0200
+Subject: [PATCH 3/3] u-boot: add 'bootdir' to the generated uEnv.txt
+When doing a full copy of:
+$deployment/usr/lib/ostree-boot -> /boot/ostree/$os-$bootcsum/
+U-Boot bootscript can use the 'bootdir' to find, for example,
+the Device Tree (dtb) file, as in:
+load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname}
+Or u-boot external bootscript:
+load ${dtype} ${disk}:${bootpart} ${a_scr} ${bootdir}${scriptname}
+It could also be possible to point 'bootdir' directly to the
+$deployment/usr/lib/ostree-boot, but this would add unnecessary
+restrictions on what file system can be used for rootfs as u-boot,
+for example, can not read from BTRFS. So having
+bootdir=/boot/ostree/$os-$bootcsum/ is a better approach here, as
+/boot can be on a separate partition with its own file system type.
+---
+ src/libostree/ostree-bootloader-uboot.c | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
+index f95ea84..0786626 100644
+--- a/src/libostree/ostree-bootloader-uboot.c
+++ b/src/libostree/ostree-bootloader-uboot.c
+@@ -72,6 +72,7 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+   g_autoptr(GPtrArray) boot_loader_configs = NULL;
+   OstreeBootconfigParser *config;
+   const char *val;
+  g_autofree char *bootdir = NULL;
+ 
+   if (!_ostree_sysroot_read_boot_loader_configs (self->sysroot, bootversion, &boot_loader_configs,
+                                                  cancellable, error))
+@@ -88,6 +89,8 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot     *self,
+       return FALSE;
+     }
+   g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image=%s", val));
+  bootdir = strndup (val, strrchr(val, '/') - val);
+  g_ptr_array_add (new_lines, g_strdup_printf ("bootdir=%s/", bootdir));
+ 
+   val = ostree_bootconfig_parser_get (config, "initrd");
+   if (val)
+-- 
+2.7.4
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 0e77368..aa757b2 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -67,7 +67,6 @@ RDEPENDS_${PN} = "\
        tzdata-europe \
        atk \
        libevent \
-        ostree \
        dracut \
        connman \
        ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index 31e0cb4..243c4de 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -58,7 +58,6 @@ RDEPENDS_${PN} += "\
    libpq-dev \
    atk-dev \
    libevent-dev \
-    ostree-dev \
    ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
    ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \
    ${MACHINE_EXTRA_INSTALL_SDK} \
diff --git a/recipes/python/nativesdk-prebuild-python.bb b/recipes/python/nativesdk-prebuild-python.bb
index 496f4eb..f09133e 100644
--- a/recipes/python/nativesdk-prebuild-python.bb
+++ b/recipes/python/nativesdk-prebuild-python.bb
@@ -31,6 +31,8 @@ LICENSE = "PSFv2"
 inherit bin_package nativesdk
+COMPATIBLE_HOST = ".*-mingw.*"
 SRC_URI[md5sum] = "6d37712f01fa836b1303141a6d4cabda"
 SRC_URI[sha256sum] = "3835868c171dddb8cb68ed5578b6d4d639387a038e999a5b008f393b704d6ad7"
 SRC_URI = "http://download.qt.io/development_releases/prebuilt/gdb/build-prerequisites/python.zip"
@@ -51,3 +53,6 @@ do_install() {
 sysroot_stage_dirs_append() {
    sysroot_stage_dir $from${bindir} $to${bindir}
 }
+# requires /usr/local/bin/python, but no providers found
+INSANE_SKIP_${PN} += "file-rdeps"
diff --git a/recipes/samba/samba_4.1.12.bbappend b/recipes/samba/samba_4.%.bbappend
index 4a86809..4a86809 100644
--- a/recipes/samba/samba_4.1.12.bbappend
+++ b/recipes/samba/samba_4.%.bbappend
diff --git a/recipes/systemd/systemd/usb-rndis.network b/recipes/systemd/systemd/usb-rndis.network
new file mode 100644
index 0000000..d529eeb
--- /dev/null
+++ b/recipes/systemd/systemd/usb-rndis.network
@@ -0,0 +1,5 @@
+[Match]
+Type=gadget
+[Network]
+LinkLocalAddressing=yes
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend
index 0877135..4dce1b2 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/recipes/systemd/systemd_%.bbappend
@@ -28,11 +28,19 @@
 ############################################################################
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"
+SRC_URI += " \
+    file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \
+    file://usb-rndis.network \
+"
+PACKAGECONFIG_append = " networkd"
 do_install_append() {
    # remove login from tty1
    rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
+    # set up link-local IPs for USB network interface
+    install -d ${D}${prefix}/lib/systemd/network/
+    install -m 0644 ${WORKDIR}/usb-rndis.network ${D}${prefix}/lib/systemd/network/
 }
 do_verify_patch_required() {
diff --git a/recipes/udev/udev/0001-support-multitouch-screens.patch b/recipes/udev/udev/0001-support-multitouch-screens.patch
deleted file mode 100644
index aacb8e0..0000000
--- a/recipes/udev/udev/0001-support-multitouch-screens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Fri, 12 Apr 2013 09:41:41 +0300
-Subject: [PATCH] support multitouch screens
---
- src/udev-builtin-input_id.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c
-index a062ef7..0c5358e 100644
--- a/src/udev-builtin-input_id.c
-+++ b/src/udev-builtin-input_id.c
-@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev,
-                 return;
-         }
- 
-        if (test_bit (EV_ABS, bitmask_ev) &&
-            test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
-+        if (test_bit (EV_ABS, bitmask_ev) && (
-+            (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) ||
-+            (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) {
-                 if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key))
-                         udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1");
-                 else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key))
-- 
-1.7.10.4
diff --git a/recipes/udev/udev/beagleboard/udev-cache.default b/recipes/udev/udev/beagleboard/udev-cache.default
deleted file mode 100644
index d0050b8..0000000
--- a/recipes/udev/udev/beagleboard/udev-cache.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev/beaglebone/udev-cache.default b/recipes/udev/udev/beaglebone/udev-cache.default
deleted file mode 100644
index d0050b8..0000000
--- a/recipes/udev/udev/beaglebone/udev-cache.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb b/recipes/virtualbox/virtualbox-guest-additions_5.1.4.bb
index 6fa6963..3522ed5 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb
+++ b/recipes/virtualbox/virtualbox-guest-additions_5.1.4.bb
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
-SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd"
+SRC_URI[md5sum] = "e25a6a1f3c113c373dc0433f9c2526f3"
-SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36"
+SRC_URI[sha256sum] = "b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf"
 S = "${WORKDIR}/vbox"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 89a97f7..2ad25df 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -6,8 +6,6 @@
  <remote fetch="git://git.yoctoproject.org" name="yocto"/>
  <remote fetch="git://git.openembedded.org" name="oe"/>
  <remote fetch="git://github.com/Freescale" name="freescale"/>
-  <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <remote fetch="git://git.toradex.com" name="toradex"/>
  <remote fetch="git://github.com/architech-boards" name="architech"/>
  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
  <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
@@ -17,11 +15,11 @@
  <project name="poky"
           remote="yocto"
-           revision="40376446904ae3529be41737fed9a0b650ed167d"
+           revision="fc75bea445bb57e1e942b5049ee2b6e5245649ea"
           path="sources/poky"/>
  <project name="meta-openembedded"
           remote="oe-mirror"
-           revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
+           revision="247b1267bbe95719cd4877d2d3cfbaf2a2f4865a"
           path="sources/meta-openembedded"/>
  <project name="meta-qt5"
           remote="qtyocto"
@@ -30,38 +28,28 @@
  <project name="meta-mingw"
           remote="qtyocto"
           path="sources/meta-mingw"
-           revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
+           revision="70e42fd678d494bf11a12cb57eff820142543159"/>
  <project name="meta-fsl-arm"
           remote="yocto"
-           revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
+           revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
           path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
+           groups="notdefault,external,fsl,architech,ti,smx6,renesas"/>
  <project name="meta-ti"
           remote="yocto"
-           revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
+           revision="f807c7185321fb407e82c529ddff310dc037f727"
           path="sources/meta-ti"
-           groups="notdefault,external,ti,bbb"/>
+           groups="notdefault,external,ti"/>
  <project name="meta-raspberrypi"
           remote="yocto"
-           revision="e82417d33b8147f65141ef937d56735d80ee7207"
+           revision="2745399f75d7564fcc586d0365ff73be47849d0e"
           path="sources/meta-raspberrypi"
           groups="notdefault,external,rpi"/>
  <project name="meta-fsl-arm-extra"
           remote="freescale"
-           revision="dd074c47af53948041f6c5671e519fbf815b0980"
+           revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
           path="sources/meta-fsl-arm-extra"
-           groups="notdefault,external,fsl,toradex,architech,smx6"/>
+           groups="notdefault,external,fsl,architech,smx6"/>
-  <project name="meta-beagleboard"
-           remote="beagleboard"
-           revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
-           path="sources/meta-beagleboard"
-           groups="notdefault,external,bbb"/>
-  <project name="meta-toradex"
-           remote="toradex"
-           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
-           path="sources/meta-toradex"
-           groups="notdefault,external,toradex"/>
  <project name="meta-tibidabo"
           remote="architech"
           revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
@@ -69,12 +57,12 @@
           groups="notdefault,external,architech"/>
  <project name="meta-intel"
           remote="intel"
-           revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
+           revision="b8c199201ffe026485a14e1fcfc398e2b3551512"
           path="sources/meta-intel"
           groups="notdefault,external,intel"/>
  <project name="meta-renesas"
           remote="yocto"
-           revision="b7843bd6a2835e5199cab9ba196c5e67b15acaed"
+           revision="d20e5bffb582c6bfabdadc22e903df86c8cfd66b"
           path="sources/meta-renesas"
           groups="notdefault,external,renesas"/>
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
deleted file mode 100644
index 829ffcb..0000000
--- a/scripts/manifest_jethro.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <default sync-j="4" revision="dizzy"/>
-  <remote fetch="git://git.yoctoproject.org" name="yocto"/>
-  <remote fetch="git://git.openembedded.org" name="oe"/>
-  <remote fetch="git://github.com/Freescale" name="freescale"/>
-  <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <remote fetch="git://git.toradex.com" name="toradex"/>
-  <remote fetch="git://github.com/architech-boards" name="architech"/>
-  <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
-  <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
-  <remote fetch="git://git.yoctoproject.org" name="intel"/>
-  <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
-  <project name="poky"
-           remote="yocto"
-           revision="jethro"
-           path="sources/poky"/>
-  <project name="meta-openembedded"
-           remote="oe-mirror"
-           revision="jethro"
-           path="sources/meta-openembedded"/>
-  <project name="meta-qt5"
-           remote="qtyocto"
-           revision="5.7"
-           path="sources/meta-qt5"/>
-  <project name="meta-mingw"
-           remote="qtyocto"
-           path="sources/meta-mingw"
-           revision="jethro"/>
-  <project name="meta-fsl-arm"
-           remote="yocto"
-           revision="jethro"
-           path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
-  <project name="meta-ti"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-ti"
-           groups="notdefault,external,ti,bbb"/>
-  <project name="meta-raspberrypi"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-raspberrypi"
-           groups="notdefault,external,rpi"/>
-  <project name="meta-fsl-arm-extra"
-           remote="freescale"
-           revision="jethro"
-           path="sources/meta-fsl-arm-extra"
-           groups="notdefault,external,fsl,toradex,architech,smx6"/>
-  <project name="meta-beagleboard"
-           remote="beagleboard"
-           revision="master"
-           path="sources/meta-beagleboard"
-           groups="notdefault,external,bbb"/>
-  <project name="meta-toradex"
-           remote="toradex"
-           revision="V2.5"
-           path="sources/meta-toradex"
-           groups="notdefault,external,toradex"/>
-  <project name="meta-tibidabo"
-           remote="architech"
-           revision="dora"
-           path="sources/meta-tibidabo"
-           groups="notdefault,external,architech"/>
-  <project name="meta-intel"
-           remote="intel"
-           revision="jethro"
-           path="sources/meta-intel"
-           groups="notdefault,external,intel"/>
-  <project name="meta-renesas"
-           remote="yocto"
-           revision="master"
-           path="sources/meta-renesas"
-           groups="notdefault,external,renesas"/>
-  <project name="nvidia-layer"
-           remote="playground"
-           revision="master"
-           path="sources/nvidia-layer"
-           groups="notdefault,internal"/>
-  <project name="jetson-tk1-pro"
-           remote="playground"
-           revision="master"
-           path="sources/jetson-tk1-pro"
-           groups="notdefault,internal"/>
-  <project name="vibrante-t186"
-           remote="playground"
-           revision="master"
-           path="sources/vibrante-t186"
-           groups="notdefault,internal"/>
-  <project name="meta-smx6"
-           remote="playground"
-           revision="fido"
-           path="sources/meta-smx6"
-           groups="notdefault,internal"/>
-  <project name="renesas-rcar-gen2"
-           remote="playground"
-           revision="master"
-           path="sources/renesas-rcar-gen2"
-           groups="notdefault,internal"/>
-</manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 5ee1ad0..5825bf1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -57,7 +57,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
  case ${MACHINE} in
    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      LAYERSCONF="bblayers.conf.toradex.sample"
+      LAYERSCONF="bblayers.conf.fsl.sample"
    ;;
    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
      LAYERSCONF="bblayers.conf.fsl.sample"
@@ -68,13 +68,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    tibidabo)
      LAYERSCONF="bblayers.conf.tibidabo.sample"
    ;;
-    beagleboard|am335x-evm)
+    beagleboard|beaglebone|am335x-evm)
      LAYERSCONF="bblayers.conf.ti.sample"
    ;;
-    beaglebone)
+    raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
-      LAYERSCONF="bblayers.conf.bbb.sample"
-    ;;
-    raspberrypi|raspberrypi2|raspberrypi3)
      LAYERSCONF="bblayers.conf.rpi.sample"
    ;;
    intel-corei7-64)
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 96189ea..af7e1f2 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
-RELEASE=5.7
+RELEASE=5.8
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then