274 files changed, 9354 insertions, 5534 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 30166d1..decc2ec 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"
@@ -115,24 +115,15 @@ get_groups() {
    smarc-samx6i)
      PROJECT_GROUPS="smx6"
    ;;
-    tibidabo)
+    beagleboard|beaglebone|am335x-evm)
-      PROJECT_GROUPS="architech"
-    ;;
-    beagleboard|am335x-evm)
      PROJECT_GROUPS="ti"
    ;;
-    beaglebone)
+    raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
-      PROJECT_GROUPS="bbb"
-    ;;
-    raspberrypi|raspberrypi2|raspberrypi3)
      PROJECT_GROUPS="rpi"
    ;;
    intel-corei7-64)
      PROJECT_GROUPS="intel"
    ;;
-    nvidia-logan)
-      PROJECT_GROUPS="nvidia-logan"
-    ;;
    tegra-x1|tegra-t18x)
      PROJECT_GROUPS="nvidia-tegra"
    ;;
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/internal-build.bbclass b/classes/internal-build.bbclass
index ecee863..ffd38c1 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -34,6 +34,7 @@ python enable_internal_build () {
    except:
        return
+    e.data.setVar('ENABLE_QDBD', "1")
    e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH")
    e.data.setVar('PREMIRRORS', "\
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/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/classes/qbsp-image.bbclass
index d2eb2b7..c80aa23 100644
--- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
+++ b/classes/qbsp-image.bbclass
@@ -27,9 +27,27 @@
 ##
 ############################################################################
-do_deploy_append() {
+QBSP_IMAGE_CONTENT ??= ""
-    if [ "${RPI_FT5406}" = "1" ]; then
-        echo "# Enable rpi-ft5406 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+fakeroot do_qbsp_image () {
-        echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    if [ -z "${QBSP_IMAGE_CONTENT}" ]; then
+        exit 0
    fi
+    mkdir -p ${S}/qbsp
+    for item in ${QBSP_IMAGE_CONTENT}; do
+        src=`echo $item | awk -F':' '{ print $1 }'`
+        dst=`echo $item | awk -F':' '{ print $2 }'`
+        install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst
+    done
+    cd ${S}/qbsp
+    7z a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z .
+    rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z
+    ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z
 }
+IMAGE_POSTPROCESS_COMMAND += "do_qbsp_image;"
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
new file mode 100644
index 0000000..6707ce3
--- /dev/null
+++ b/classes/qbsp.bbclass
@@ -0,0 +1,151 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+inherit meta nopackages abi-arch
+FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:"
+SRC_URI = "\
+    file://base_package.xml \
+    file://image_package.xml \
+    file://toolchain_package.xml \
+    file://toolchain_installscript.qs \
+    "
+INHIBIT_DEFAULT_DEPS = "1"
+do_qbsp[depends] += "\
+    installer-framework:do_populate_sysroot \
+    ${QBSP_SDK_TASK}:do_populate_sdk \
+    ${QBSP_IMAGE_TASK}:do_image_complete \
+    "
+QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
+QBSP_INSTALLER_COMPONENT ?= "${MACHINE}"
+QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}"
+QBSP_LICENSE_DEPENDENCY ?= ""
+QBSP_LICENSE_DEPENDENCY_imx = "qt.embedded.b2qt.freescalelicense"
+VERSION_AUTO_INCREMENT = "-0-${DATETIME}"
+VERSION_AUTO_INCREMENT[vardepsexclude] = "DATETIME"
+DEPLOY_CONF_NAME ?= "${MACHINE}"
+RELEASEDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}"
+IMAGE_PACKAGE = "${QBSP_IMAGE_TASK}-${MACHINE}.7z"
+SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${QBSP_SDK_TASK}-${MACHINE}.${SDK_POSTFIX}"
+SDK_POSTFIX = "sh"
+SDK_POSTFIX_sdkmingw32 = "7z"
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}"
+B = "${WORKDIR}/build"
+patch_installer_files() {
+    sed -e 's#@NAME@#${DEPLOY_CONF_NAME}#' \
+        -e 's#@VERSION@#${QBSP_VERSION}#' \
+        -e 's#@RELEASEDATE@#${RELEASEDATE}#' \
+        -e 's#@MACHINE@#${MACHINE}#' \
+        -e 's#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#' \
+        -e 's#@TARGET@#${TARGET_SYS}#' \
+        -e 's#@ABI@#${ABI}#' \
+        -e 's#@INSTALLPATH@#${QBSP_INSTALL_PATH}#' \
+        -e 's#@SDKPATH@#${SDKPATH}#' \
+        -e 's#@SDKFILE@#${SDK_NAME}#' \
+        -e 's#@LICENSEDEPENDENCY@#${QBSP_LICENSE_DEPENDENCY}#' \
+        -i ${1}/*
+}
+prepare_qbsp() {
+    # Toolchain component
+    TOOLCHAIN_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.toolchain"
+    mkdir -p ${TOOLCHAIN_PATH}/meta
+    mkdir -p ${TOOLCHAIN_PATH}/data
+    cp ${WORKDIR}/toolchain_package.xml ${TOOLCHAIN_PATH}/meta/package.xml
+    cp ${WORKDIR}/toolchain_installscript.qs ${TOOLCHAIN_PATH}/meta/installscript.qs
+    patch_installer_files ${TOOLCHAIN_PATH}/meta
+    mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain
+    if [ "${SDK_POSTFIX}" == "7z" ]; then
+        7z x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
+    else
+        cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
+    fi
+    cd ${B}/toolchain
+    archivegen ${TOOLCHAIN_PATH}/data/toolchain.7z *
+    # Image component
+    IMAGE_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system"
+    mkdir -p ${IMAGE_PATH}/meta
+    mkdir -p ${IMAGE_PATH}/data
+    cp ${WORKDIR}/image_package.xml ${IMAGE_PATH}/meta/package.xml
+    patch_installer_files ${IMAGE_PATH}/meta
+    mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
+    7z x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
+    cd ${B}/images
+    archivegen ${IMAGE_PATH}/data/image.7z *
+    # Base component
+    BASE_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}"
+    mkdir -p ${BASE_PATH}/meta
+    cp ${WORKDIR}/base_package.xml ${BASE_PATH}/meta/package.xml
+    patch_installer_files ${BASE_PATH}/meta
+}
+create_qbsp() {
+    prepare_qbsp
+    # Repository creation
+    repogen -p ${B}/pkg ${B}/repository
+    mkdir -p ${DEPLOY_DIR}/qbsp
+    rm -f ${DEPLOY_DIR}/qbsp/${PN}-${MACHINE}.qbsp
+    cd ${B}/repository
+    archivegen ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp *
+}
+python do_qbsp() {
+    bb.build.exec_func('create_qbsp', d)
+}
+addtask qbsp after do_unpack before do_build
+do_qbsp[cleandirs] += "${B}"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
+do_populate_lic[noexec] = "1"
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
deleted file mode 100644
index f893f8c..0000000
--- a/conf/bblayers.conf.nvidia-logan.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/nvidia-layer/meta-tegra \
-  ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
-  ${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-vib3-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-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.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..27f28ae 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 ?= ""
@@ -37,12 +37,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
 BBLAYERS ?= " \
  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-renesas \
+  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
  ${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 \
-  ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
  ${BSPDIR}/sources/meta-openembedded/meta-oe \
  ${BSPDIR}/sources/meta-openembedded/meta-python \
  ${BSPDIR}/sources/meta-openembedded/meta-networking \
@@ -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
deleted file mode 100644
index 6351d1f..0000000
--- a/conf/bblayers.conf.tibidabo.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-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-tibidabo \
-  ${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-architech-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.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 4ba9d87..4a8f73b 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"
@@ -71,10 +68,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
 PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
-MACHINE_EXTRA_INSTALL ?= ""
-MACHINE_EXTRA_INSTALL_SDK ?= ""
-MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 # Override mkspec for mingw build
 OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
 OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
@@ -84,9 +77,14 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1"
 PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
-IMAGE_FSTYPES = "tar.gz conf"
+IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 4f90a0e..4ec3e4d 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -31,28 +31,4 @@ include conf/distro/include/ti.inc
 DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
-BOOTFS_CONTENT = "\
-    u-boot-${MACHINE}.img:u-boot.img \
-    MLO-${MACHINE}:MLO \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy"
 DISTRO_FEATURES_remove = "webengine"
-PREFERRED_VERSION_linux-ti-staging = "3.14%"
-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 += "\
-        libgles-omap3-dev \
-        "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 1e8e876..ff939bb 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -28,8 +28,6 @@
 ############################################################################
 include conf/distro/include/toradex.inc
-include conf/distro/include/imx6.inc
-include conf/distro/include/imx6-egl.inc
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
@@ -40,14 +38,6 @@ UBOOT_CONFIG ??= "com it"
 UBOOT_CONFIG[com] = "apalis_imx6_defconfig"
 UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
 BOOT_SCRIPTS += " \
    u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \
    "
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 7f42acf..fa446d2 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -31,25 +31,6 @@ include conf/distro/include/ti.inc
 DEPLOY_CONF_NAME = "BeagleBoard"
-BOOTFS_CONTENT = "\
+DISTRO_FEATURES_remove = "webengine opengl"
-    u-boot-${MACHINE}.img:u-boot.img \
-    MLO-${MACHINE}:MLO \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy"
-PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
-PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
-PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
-PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
-MACHINE_EXTRA_INSTALL += "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
-        "
-MACHINE_EXTRA_INSTALL_SDK += "\
-        libgles-omap3-dev \
-        "
 ADB_PRODUCTID = "0x9018"
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 54455a3..6f12d90 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -31,37 +31,6 @@ include conf/distro/include/ti.inc
 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"
-EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
 DISTRO_FEATURES_remove = "webengine"
-PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
-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 += "\
-        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..987764a 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -28,16 +28,7 @@
 ############################################################################
 include conf/distro/include/toradex.inc
-include conf/distro/include/imx6.inc
-include conf/distro/include/imx6-egl.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 KERNEL_IMAGETYPE = "uImage"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index ca75b0a..4a4d460 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -31,14 +31,6 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
-IMAGE_FSTYPES += "ext3 sdcard"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \
-    ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
 BOOT_SCRIPTS += " \
    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
    "
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 5a8498f..df71a91 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -29,34 +29,16 @@
 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"
 IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \
-    ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
 BOOT_SCRIPTS += " \
    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
    "
-DEFAULTTUNE = "armv7ahf-neon"
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 PREFERRED_VERSION_linux-toradex = "4.1"
 DISTRO_FEATURES_remove = "webengine"
-MACHINE_EXTRA_INSTALL += "\
-        opengldummy \
-        "
-MACHINE_EXTRA_INSTALL_SDK += "\
-        opengldummy-dev \
-        "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index cd3a80a..a5b95b5 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,6 +32,8 @@ IMAGE_ROOTFS_ALIGNMENT = "1048576"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 IMAGE_FSTYPES = "ext3"
+QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
 MACHINE_EXTRA_RRECOMMENDS += "\
        kernel-module-snd-intel8x0 \
        "
@@ -45,17 +47,9 @@ DISTRO_FEATURES_remove = "webengine opengl"
 MACHINE_EXTRA_INSTALL += "\
        mount-vboxsf \
-        "
-MACHINE_EXTRA_INSTALL_SDK += "\
-        qtglesstream-dummy-client-dev \
-        "
-MACHINE_EXTRA_INSTALL_QT = "\
        qtsystems \
        qtglesstream \
        b2qt-emulator-proxy \
        b2qt-emulator-vinput \
        b2qt-emulator-sdcardmountd \
        "
-MACHINE_EXTRA_INSTALL_QT_SDK = "\
-        qtglesstream-dev \
-        "
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/conf/distro/include/fsl.inc
index 646faa5..d0e2c7a 100644
--- a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ b/conf/distro/include/fsl.inc
@@ -27,6 +27,7 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
-SRC_URI += "file://fix-gstvolume.patch"
+IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_CLASSES += "image_types_fsl"
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc
deleted file mode 100644
index 8c4bbcd..0000000
--- a/conf/distro/include/imx6-egl.inc
+++ /dev/null
@@ -1,41 +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$
-##
-############################################################################
-MACHINE_EXTRA_INSTALL += "\
-    libegl-mx6 \
-    libgles2-mx6 \
-    "
-MACHINE_EXTRA_INSTALL_SDK += " \
-    libegl-mx6 \
-    libegl-mx6-dev \
-    libgles2-mx6 \
-    libgles2-mx6-dev \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
-    "
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 1463c67..9983af3 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -27,24 +27,11 @@
 ##
 ############################################################################
-include conf/distro/include/imx6.inc
+include conf/distro/include/fsl.inc
-include conf/distro/include/imx6-egl.inc
+include conf/distro/include/opencv.inc
-include conf/distro/include/imx6-opencv.inc
 DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-sabresd.dtb:imx6dl-sabresd.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-sabresd-hdcp.dtb:imx6dl-sabresd-hdcp.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-sabresd-ldo.dtb:imx6dl-sabresd-ldo.dtb \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 DISTRO_FEATURES_DEFAULT += "wayland"
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
index b21e5b1..962077c 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -27,32 +27,8 @@
 ##
 ############################################################################
-DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual"
+include conf/distro/include/fsl.inc
-IMAGE_FSTYPES += "ext3 sdcard"
-BOOTFS_CONTENT = "\
+DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual"
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \
-    ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 DISTRO_FEATURES_remove = "webengine"
-MACHINE_EXTRA_INSTALL += "\
-        "
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index d350c0e..2ae90ee 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -29,7 +29,7 @@
 DEPLOY_CONF_NAME = "Intel NUC"
-DISTRO_FEATURES_DEFAULT += "wayland weston"
+DISTRO_FEATURES_DEFAULT += "wayland"
 DISTRO_FEATURES_remove = "usbgadget"
@@ -41,12 +41,5 @@ INITRAMFS_IMAGE = "initramfs-basic"
 SYSVINIT_ENABLED_GETTYS = "1"
 MACHINE_EXTRA_INSTALL += "\
-        wayland \
-        mesa-megadriver \
        grub-efi-config \
        "
-MACHINE_EXTRA_INSTALL_SDK += " \
-        mesa-dev \
-        "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index bfe29bf..a8db798 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -27,24 +27,11 @@
 ##
 ############################################################################
-include conf/distro/include/imx6.inc
+include conf/distro/include/fsl.inc
-include conf/distro/include/imx6-egl.inc
+include conf/distro/include/opencv.inc
-include conf/distro/include/imx6-opencv.inc
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
-    6x_bootscript-${MACHINE}:6x_bootscript \
-    6x_upgrade-${MACHINE}:6x_upgrade \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    "
-BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
 BOOT_SPACE = "16384"
 BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
                 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
@@ -89,12 +76,10 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
 UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
 UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
-EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
 KERNEL_DEVICETREE += "\
    imx6dl-nit6xlite.dtb \
-    imx6qp-nitrogen6_max.dtb \
-    imx6q-nitrogen6_som2.dtb \
    "
 DISTRO_FEATURES_DEFAULT += "wayland"
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
deleted file mode 100644
index 632e31b..0000000
--- a/conf/distro/include/nvidia-logan.conf
+++ /dev/null
@@ -1,66 +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$
-##
-############################################################################
-TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-DEFAULTTUNE = "cortexa15hf-neon"
-KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
-NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
-MACHINE_EXTRA_INSTALL += "\
-        libegl \
-        libgles2 \
-        tegra-firmware-gk20a \
-        graphics-fw \
-        libdrm-nv \
-"
-MACHINE_EXTRA_INSTALL_SDK += "\
-        libegl-dev \
-        libgles2-dev \
-        graphics-headers-dev \
-        libdrm-nv-dev \
-"
-PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
-PREFERRED_PROVIDER_drm ?= "libdrm-nv"
-BBMASK ?= " "
-BBMASK .= "\
-|meta-vib3/recipes-kernel/linux-libc-headers\
-|meta-vib3/recipes-devtools/binutils\
-|meta-vib3/recipes-core/eglibc\
-|meta-vib3/recipes-core/systemd\
-|meta-vib3/recipes-connectivity\
-|meta-vib3/recipes-multimedia/pulseaudio\
-|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\
-|meta-vib3/recipes-core/packagegroups\
-"
diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/opencv.inc
index a1d37df..a1d37df 100644
--- a/conf/distro/include/imx6-opencv.inc
+++ b/conf/distro/include/opencv.inc
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 0833404..9d8b526 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -29,19 +29,7 @@
 IMAGE_FSTYPES += "ext3 rpi-sdimg"
-BOOTFS_CONTENT = "\
-    bcm2835-bootfiles/*: \
-    ${KERNEL_IMAGETYPE}:kernel.img \
-    "
-BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
-MACHINE_EXTRA_INSTALL_SDK += " \
-        userland-dev \
-        "
 MACHINE_EXTRA_INSTALL += "\
-        userland \
        omxplayer \
        "
@@ -52,7 +40,4 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
 # video camera support
 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 9b638c3..9a33319 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -123,18 +123,18 @@ 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\
+    meta-rcar-gen2/recipes-devtools/file \
-"
+    "
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 7c441ff..39dd17d 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -27,20 +27,16 @@
 ##
 ############################################################################
-include conf/distro/include/imx6.inc
+include conf/distro/include/fsl.inc
-include conf/distro/include/imx6-egl.inc
 DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
 KERNEL_IMAGETYPE = "uImage"
-BOOTFS_CONTENT = " "
 MACHINE_EXTRA_INSTALL += "\
        kernel-devicetree \
        "
 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 f58474e..80f4d57 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -27,13 +27,19 @@
 ##
 ############################################################################
-include conf/distro/include/tegra.inc
+OLDEST_KERNEL_aarch64 = "3.18"
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
 DISTRO_FEATURES_DEFAULT += "wayland"
+IMAGE_FSTYPES += "tar.gz"
+QBSP_IMAGE_CONTENT = "\
+    ${IMAGE_LINK_NAME}.tar.gz \
+    Image \
+    "
 KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 MACHINE_EXTRA_INSTALL += "\
@@ -53,7 +59,6 @@ MACHINE_EXTRA_INSTALL += "\
    virtual/libegl \
    virtual/libgles2 \
    libdrm-nv \
-    asound-conf \
    "
 PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
@@ -65,22 +70,18 @@ PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers"
-PREFERRED_PROVIDER_wayland ?= "wayland-nv"
+BBMASK += "\
-PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
+    meta-vib4/recipes-connectivity/connman \
-PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
+    meta-vib4/recipes-core/toybox \
+    meta-vib4/recipes-core/images \
-BBMASK ?= " "
+    meta-vib4/recipes-core/packagegroups \
-BBMASK .= "\
+    meta-vib4/recipes-extended \
-|meta-vib4/recipes-connectivity/connman\
+    meta-vib4/recipes-multimedia/audiomanager \
-|meta-vib4/recipes-core/busybox\
+    meta-vib4/recipes-core/glibc \
-|meta-vib4/recipes-core/images\
+    meta-vib4/recipes-support/lvm2 \
-|meta-vib4/recipes-core/meta\
+    meta-vib4/recipes-kernel/linux-libc-headers \
-|meta-vib4/recipes-core/packagegroups\
+    meta-vib4/recipes-devtools/binutils \
-|meta-vib4/recipes-core/systemd/systemd\
+    meta-vib4/recipes-yocto-ivi/packagegroups \
-|meta-vib4/recipes-devtools\
+    meta-vib4/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend \
-|meta-vib4/recipes-extended\
+    meta-vib4/recipes-graphics/wayland/libinput_%.bbappend \
-|meta-vib4/recipes-multimedia/audiomanager\
+    "
-|meta-vib4/recipes-core/glibc\
-|meta-vib4/recipes-support/lvm2\
-|meta-vib4/recipes-kernel/linux-libc-headers\
-"
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc
deleted file mode 100644
index 618a634..0000000
--- a/conf/distro/include/tegra.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-python set_nv_drv_version () {
-    # Boiler plate code to setup bitbake objects
-    d = e.data
-    nv_drv_version = d.getVar('NV_DRV_VER', True)
-    if nv_drv_version != "ignore":
-        # FIXME: When we add support to internal builds, both debug and release
-        # builds will need to be considered
-        path = d.getVar('PLATFORM_TOPDIR', True)
-        get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \
-| grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}"
-        # Execute cmd
-        nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip()
-        # Store returned value in NV_DRV_VER
-        d.setVar('NV_DRV_VER', nv_drv_version)
-}
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index a445dc2..4c9f803 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -27,11 +27,16 @@
 ##
 ############################################################################
-BBMASK ?= " "
+include conf/distro/include/fsl.inc
-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}"
+BOOT_SCRIPTS += "\
+    MLO-${MACHINE}:MLO \
+    u-boot-${MACHINE}.img:u-boot.img \
+    "
+EXTRA_IMAGEDEPENDS += "u-boot"
+PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
deleted file mode 100644
index 01e1f63..0000000
--- a/conf/distro/include/tibidabo.conf
+++ /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$
-##
-############################################################################
-include conf/distro/include/imx6.inc
-include conf/distro/include/imx6-egl.inc
-DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
-KERNEL_IMAGETYPE = "uImage"
-BOOTFS_CONTENT = "\
-    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
-    bootscript:bootscript \
-    "
-BOOTFS_DEPENDS = "tibidabo-bootscript-sd:do_deploy virtual/kernel:do_deploy"
-# mx6 GPU libraries
-PREFERRED_PROVIDER_virtual/egl_mx6 = "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
-KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 647362d..d6b74e0 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -27,11 +27,12 @@
 ##
 ############################################################################
-BBMASK ?= " "
+include conf/distro/include/fsl.inc
-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"
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex"
 MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
 BOOT_SCRIPTS += " \
    fwd_blk.img:flash_blk.img \
diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml
new file mode 100644
index 0000000..28261d5
--- /dev/null
+++ b/files/qbsp/base_package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<Package>
+  <Version>@VERSION@</Version>
+  <ReleaseDate>@RELEASEDATE@</ReleaseDate>
+  <DisplayName>@NAME@</DisplayName>
+  <Description>Boot to Qt for @NAME@ with Embedded Linux baselayer</Description>
+  <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
+</Package>
diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml
new file mode 100644
index 0000000..1eaf69c
--- /dev/null
+++ b/files/qbsp/image_package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<Package>
+  <Version>@VERSION@</Version>
+  <ReleaseDate>@RELEASEDATE@</ReleaseDate>
+  <DisplayName>@NAME@ Linux System</DisplayName>
+  <Description>SD-Card image for @NAME@ hardware with Embedded Linux baselayer</Description>
+  <DownloadableArchives>image.7z</DownloadableArchives>
+</Package>
diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
new file mode 100644
index 0000000..bcf9cd1
--- /dev/null
+++ b/files/qbsp/toolchain_installscript.qs
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+function Component()
+{
+}
+Component.prototype.createOperations = function()
+{
+    component.createOperations();
+    var device = "@MACHINE@"
+    var platform = "@NAME@"
+    var sysroot = "@SYSROOT@"
+    var target = "@TARGET@"
+    var abi = "@ABI@"
+    var installPath = "@INSTALLPATH@/toolchain"
+    var sdkPath = "@SDKPATH@"
+    var sdkFile = "@SDKFILE@"
+    var path = installer.value("TargetDir") + installPath;
+    if (systemInfo.kernelType !== "winnt") {
+        var script = path + "/" + sdkFile;
+        component.addOperation("Execute", "{0}", "chmod", "+x", script);
+        component.addOperation("Execute", "{0}", script, "-y", "-d", path, "UNDOEXECUTE", "rm", "-rf", path);
+        component.addOperation("Execute", "{0}", "/bin/rm", script);
+    } else {
+        var search = sdkPath;
+        path = path.replace(/\\/g,"/");
+        component.addOperation("Replace",
+                                path + "/sysroots/i686-pokysdk-mingw32/usr/bin/qt.conf",
+                                search, path);
+    }
+    // qt.embedded.b2qt.xx
+    var baseid = component.name.substring(17,19);
+    var basecomponent = component.name.substring(0, component.name.lastIndexOf("."));
+    var toolchainId = "ProjectExplorer.ToolChain.Gcc:" + component.name;
+    var qtId = basecomponent + ".qt";
+    var icon = installer.value("B2QtDeviceIcon");
+    var executableExt = "";
+    var hostSysroot = "x86_64-pokysdk-linux";
+    if (systemInfo.kernelType === "winnt") {
+        executableExt = ".exe";
+        hostSysroot = "i686-pokysdk-mingw32";
+    }
+    var deviceType = "Boot2Qt.HwDevice"
+    component.addOperation("Execute",
+        ["@SDKToolBinary@", "addTC",
+        "--id", toolchainId,
+        "--name", "GCC (Boot2Qt " + platform + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt,
+        "--abi", abi,
+        "UNDOEXECUTE",
+        "@SDKToolBinary@", "rmTC", "--id", toolchainId]);
+    component.addOperation("Execute",
+        ["@SDKToolBinary@", "addQt",
+         "--id", qtId,
+         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--type", "Boot2Qt.QtVersionType",
+         "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
+         "UNDOEXECUTE",
+         "@SDKToolBinary@", "rmQt", "--id", qtId]);
+    var addKitOperations = ["@SDKToolBinary@", "addKit",
+         "--id", basecomponent,
+         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--mkspec", "devices/linux-oe-generic-g++",
+         "--qt", qtId,
+         "--debuggerengine", "1",
+         "--debugger", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt,
+         "--sysroot", path + "/sysroots/" + sysroot,
+         "--devicetype", deviceType,
+         "--toolchain", toolchainId,
+         "--icon", icon];
+    addKitOperations.push("UNDOEXECUTE", "@SDKToolBinary@", "rmKit", "--id", basecomponent);
+    component.addOperation("Execute", addKitOperations);
+}
diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml
new file mode 100644
index 0000000..85a2c67
--- /dev/null
+++ b/files/qbsp/toolchain_package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<Package>
+  <Version>@VERSION@</Version>
+  <ReleaseDate>@RELEASEDATE@</ReleaseDate>
+  <DisplayName>@NAME@ Linux Toolchain</DisplayName>
+  <Description>Toolchain and system root for @NAME@ with Embedded Linux baselayer</Description>
+  <DownloadableArchives>toolchain.7z</DownloadableArchives>
+  <Dependencies>qt.tools.qtcreator</Dependencies>
+  <Script>installscript.qs</Script>
+</Package>
diff --git a/meta-architech-extras/conf/layer.conf b/meta-architech-extras/conf/layer.conf
deleted file mode 100644
index 15ca0f8..0000000
--- a/meta-architech-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_architech"
-BBFILE_PATTERN_b2qt_architech := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_architech = "20"
diff --git a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch b/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch
deleted file mode 100644
index 6df6cd6..0000000
--- a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd/0001-Updated-kernel-arguments-for-tibidabo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From 020c8ffc859d03b26ae50d0b4cf008ec655e26a0 Mon Sep 17 00:00:00 2001
-From: aavit <eirik.aavitsland@theqtcompany.com>
-Date: Mon, 27 Oct 2014 12:41:32 +0100
-Subject: [PATCH] Updated kernel arguments for tibidabo
-diff --git a/recipes-bsp/bootscript/tibidabo-bootscript-sd-1.0/bootscript.source b/recipes-bsp/bootscript/tibidabo-bootscript-sd-1.0/bootscript.source
-index 1902d81..4247a08 100644
--- a/bootscript.source
-+++ b/bootscript.source
-@@ -1,5 +1,6 @@
- setenv bootargs ${bootargs} vmalloc=400M root=/dev/mmcblk0p2 rw,rootwait consoleblank=0 video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 video=mxcfb1:dev=lcd,CLAA-WVGA,if=RGB666 fbmem=28M,10M
- mmc dev 0
-+setenv bootargs ${bootargs} vt.global_cursor_default=0
- for file_system in fat ext2; do
-     ${file_system}load mmc 0:1 ${loadaddr} /uImage && bootm ${loadaddr}
- done
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
deleted file mode 100644
index 6b0cd3c..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright (C) 2012-2013 Freescale Semiconductor
-# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "GPU driver and apps for imx6"
-SECTION = "libs"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}"
-PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
-PE = "1"
-inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
-           file://egl.pc \
-           file://egl_x11.pc \
-           file://glesv1_cm.pc \
-           file://glesv1_cm_x11.pc \
-           file://glesv2.pc \
-           file://glesv2_x11.pc \
-           file://vg.pc \
-           file://vg_x11.pc \
-           file://gc_wayland_protocol.pc \
-           file://wayland-egl.pc \
-           file://wayland-viv.pc \
-          "
-PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
-    libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
-    libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
-    libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
-    libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
-    libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
-    libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
-    libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \
-    libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \
-    libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
-    libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
-    libvivante-dri-mx6 \
-    libvivante-dfb-mx6 \
-    libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \
-    libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
-    libwayland-egl-mx6-dev \
-"
-# Skip package if it does not match the machine float-point type in use
-python __anonymous () {
-        is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d)
-        is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp"
-        if is_package_hardfp != is_machine_hardfp:
-                PN = d.getVar("PN", True)
-                PV = d.getVar("PV", True)
-                bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV))
-                raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine")
-}
-USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
-USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}"
-USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
-# Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# FIXME: The provided binary doesn't provide soname. If in future BSP
-# release the libraries are fixed, we can drop this hack.
-REALSOLIBS := "${SOLIBS}"
-SOLIBS = "${SOLIBSDEV}"
-# For the packages that make up the OpenGL interfaces, inject variables so that
-# they don't get Debian-renamed (which would remove the -mx6 suffix).
-#
-# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-# the source we cannot fix it. Disable the insane check for now.
-python __anonymous() {
-    packages = d.getVar('PACKAGES', True).split()
-    for p in packages:
-        d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
-    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
-              ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
-              ("libgles3",)):
-        fullp = p[0] + "-mx6"
-        pkgs = " ".join(p)
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-        # For -dev, the first element is both the Debian and original name
-        fullp += "-dev"
-        pkgs = p[0] + "-dev"
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-}
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -a ${S}/usr/lib/*.so* ${D}${libdir}
-    cp -axr ${S}/usr/include/* ${D}${includedir}
-    cp -axr ${S}/opt ${D}
-    install -d ${D}${libdir}/pkgconfig
-    # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
-    if [ "${USE_X11}" = "yes" ]; then
-        cp -r ${S}/usr/lib/dri ${D}${libdir}
-        backend=x11
-        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
-        #FIXME: WL & X11 is not currently functional
-        #if [ "${USE_WL}" = "yes" ]; then
-        #    install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        #    install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
-        #    install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
-        #fi
-    elif [ "${USE_WL}" = "yes" ]; then
-        backend=wl
-        install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
-        install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
-        install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
-    else
-        install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
-        if [ "${USE_DFB}" = "yes" ]; then
-            cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir}
-            backend=dfb
-        else
-            # Regular framebuffer
-            backend=fb
-        fi
-    fi
-    # We'll only have one backend here so we rename it to generic name
-    # and avoid rework in other packages, when possible
-    mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
-    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
-    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
-    mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
-    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
-    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
-    mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
-    mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so
-    for backend in wl x11 fb dfb; do
-        find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
-    done
-    find ${D}${libdir} -type f -exec chmod 644 {} \;
-    find ${D}${includedir} -type f -exec chmod 644 {} \;
-}
-S = "${WORKDIR}/${PN}-${PV}"
-FILES_${PN} += "/opt"
-FILES_${PN}-dev = "${includedir}"
-FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug"
-FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
-FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
-FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
-# libEGL.so is used by some demo apps from Freescale
-INSANE_SKIP_libegl-mx6 += "dev-so"
-FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
-FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
-FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
-FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
-FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
-FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
-FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
-FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
-RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev"
-# libEGL needs to open libGLESv1.so
-INSANE_SKIP_libgles-mx6 += "dev-so"
-FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
-FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
-FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
-# libEGL needs to open libGLESv2.so
-INSANE_SKIP_libgles2-mx6 += "dev-so"
-FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
-FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
-FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
-RDEPENDS_libgles2-mx6 = "libglslc-mx6"
-FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
-FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
-FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
-FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}"
-FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
-FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
-RDEPENDS_libopencl-mx6 = "libclc-mx6"
-FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
-FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
-FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
-FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
-FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
-FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
-FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
-FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
-FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
-FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
-FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so"
-INSANE_SKIP_libwayland-viv-mx6 += "dev-so"
-FILES_libwayland-viv-mx6 =  "${libdir}/libwayland-viv${REALSOLIBS}  ${libdir}/libwayland-viv${SOLIBS}"
-FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
-FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}"
-INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so"
-FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
-FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
-FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}"
-FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
deleted file mode 100644
index dc91d7c..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
-From: Jeremy Stashluk <jstashluk@dekaresearch.com>
-Date: Wed, 30 Jan 2013 13:16:53 -0500
-Subject: [PATCH] change header path to HAL
-The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
-directory under the system. I think this is a problem in the LTIB release as
-well.
-Upstream-Status: Pending
-Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
---
- usr/include/gc_vdk_types.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
-===================================================================
--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h
-+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
-@@ -39,7 +39,7 @@ extern "C" {
- #endif
- 
- #include <EGL/egl.h>
-#include "gc_hal_eglplatform_type.h"
-+#include <HAL/gc_hal_eglplatform_type.h>
- 
- 
- /*******************************************************************************
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
deleted file mode 100644
index a21922d..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: egl
-Description: Vivante EGL library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
deleted file mode 100644
index 5921583..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: egl
-Description: Vivante EGL library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} -DLINUX
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
deleted file mode 100644
index 3eac116..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Avoid conflicting types with Xorg newer code
-Upstream-Status: Pending
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
-===================================================================
--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h
-+++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
-@@ -101,7 +101,7 @@ extern gcsPLS gcPLS;
- typedef struct _gcsTLS * gcsTLS_PTR;
- 
- typedef void (* gctTLS_DESTRUCTOR) (
-    gcsTLS_PTR TLS
-+    gcsTLS_PTR pTLS
-     );
- 
- typedef struct _gcsTLS
-@@ -648,10 +648,10 @@ gcoOS_SetPLSValue(
- /* Get access to the thread local storage. */
- gceSTATUS
- gcoOS_GetTLS(
-    OUT gcsTLS_PTR * TLS
-+    OUT gcsTLS_PTR * pTLS
-     );
- 
-    /* Copy the TLS from a source thread. */
-+    /* Copy the pTLS from a source thread. */
-     gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source);
- 
- /* Destroy the objects associated with the current thread. */
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
deleted file mode 100644
index 732a073..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001
-From: Adrian Alonso <aalonso00@gmail.com>
-Date: Sat, 26 Jan 2013 17:52:04 -0600
-Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs
-* Remove header undefs for Always and Status definitions
-Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
---
- usr/include/HAL/gc_hal_eglplatform.h | 3 ---
- 1 file changed, 3 deletions(-)
-diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h
-index a968fe7..e80c65a 100644
--- a/usr/include/HAL/gc_hal_eglplatform.h
-+++ b/usr/include/HAL/gc_hal_eglplatform.h
-@@ -341,14 +341,11 @@ typedef Pixmap      HALNativePixmapType;
- /* Rename some badly named X defines. */
- #ifdef Status
- #   define XStatus      int
-#   undef Status
- #endif
- #ifdef Always
- #   define XAlways      2
-#   undef Always
- #endif
- #ifdef CurrentTime
-#   undef CurrentTime
- #   define XCurrentTime 0
- #endif
- 
-- 
-1.8.1
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
deleted file mode 100644
index f4610ea..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-Name: gc_wayland_protocol
-Description: Vivante Wayland Protocol Extension Library
-Version: 0.1
-Cflags: -I${includedir}
-Libs: -L${libdir} -lgc_wayland_protocol
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
deleted file mode 100644
index d97b067..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: glesv1_cm
-Description: Vivante OpenGL ES 1.1 CM library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
deleted file mode 100644
index e801633..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: glesv1_cm
-Description: Vivante OpenGL ES 1.1 CM library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
deleted file mode 100644
index 9be46f2..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: glesv2
-Description: Vivante OpenGL ES 2.0 library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
deleted file mode 100644
index 57ad807..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: glesv2
-Description: Vivante OpenGL ES 2.0 library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
deleted file mode 100644
index 7c00def..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: vg
-Description: Vivante OpenVG 1.1 library
-Requires.private:
-Version: 8.0
-Libs: -L${libdir} -lOpenVG -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
deleted file mode 100644
index 94fb91e..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-Name: vg
-Description: Vivante OpenVG 1.1 library
-Requires.private: libdrm x11 xext xdamage xfixes xcb
-Version: 8.0
-Libs: -L${libdir} -lOpenVG -lEGL -lGAL
-Libs.private: -lpthread -lrt
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
deleted file mode 100644
index ba1b898..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-Name: wayland-egl
-Description: Bind the driver EGL to the Wayland API
-Version: 1.0.0
-Libs: -L${libdir} -lEGL
-Cflags: -I${includedir}
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
deleted file mode 100644
index 3fdedd0..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-Name: Wayland Vivante Lib
-Description: Wayland server side library for Vivante's EGL driver
-Version: 0.1
-Cflags: -I${includedir}/wayland-viv
-Libs: -L${libdir} -lwayland-viv
diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
deleted file mode 100644
index 56610fb..0000000
--- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-require gpu-viv-bin-mx6q.inc
-SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e"
-SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003"
-PACKAGE_FP_TYPE = "hardfp"
diff --git a/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
deleted file mode 100644
index f2a736a..0000000
--- a/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-require recipes-bsp/imx-lib/imx-lib.inc
-SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2"
-SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8"
-PE = "1"
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch
deleted file mode 100644
index abc02c9..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 503daf4789dd23e4dc1e16c256de0c163fc2bf87 Mon Sep 17 00:00:00 2001
-From: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date: Wed, 4 Apr 2012 10:45:27 +0200
-Subject: [PATCH] perf tools: Fix getrusage() related build failure on glibc
- trunk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Organization: O.S. Systems Software LTDA.
-On a system running glibc trunk perf doesn't build:
-    CC builtin-sched.o
-builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration]
-    [...]
-Fix it by including sys/resource.h.
-Upstream-Status: Pending
-Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
-Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Link: http://lkml.kernel.org/r/20120404084527.GA294@x4
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
- tools/perf/builtin-sched.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
-index dcfe887..3632c2f 100644
--- a/tools/perf/builtin-sched.c
-+++ b/tools/perf/builtin-sched.c
-@@ -14,6 +14,7 @@
- #include "util/debug.h"
- 
- #include <sys/prctl.h>
-+#include <sys/resource.h>
- 
- #include <semaphore.h>
- #include <pthread.h>
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
deleted file mode 100644
index 4c31e74..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 2235b85f1c76d98b5f1e160cbd0a61a84c15e125 Mon Sep 17 00:00:00 2001
-From: Ivan Djelic <ivan.djelic@parrot.com>
-Date: Wed, 6 Mar 2013 20:09:27 +0100
-Subject: [PATCH] ARM: 7668/1: fix memset-related crashes caused by recent GCC
- (4.7.2) optimizations
-Organization: O.S. Systems Software LTDA.
-Recent GCC versions (e.g. GCC-4.7.2) perform optimizations based on
-assumptions about the implementation of memset and similar functions.
-The current ARM optimized memset code does not return the value of
-its first argument, as is usually expected from standard implementations.
-For instance in the following function:
-void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
-{
-        memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
-        waiter->magic = waiter;
-        INIT_LIST_HEAD(&waiter->list);
-}
-compiled as:
-800554d0 <debug_mutex_lock_common>:
-800554d0:       e92d4008        push    {r3, lr}
-800554d4:       e1a00001        mov     r0, r1
-800554d8:       e3a02010        mov     r2, #16 ; 0x10
-800554dc:       e3a01011        mov     r1, #17 ; 0x11
-800554e0:       eb04426e        bl      80165ea0 <memset>
-800554e4:       e1a03000        mov     r3, r0
-800554e8:       e583000c        str     r0, [r3, #12]
-800554ec:       e5830000        str     r0, [r3]
-800554f0:       e5830004        str     r0, [r3, #4]
-800554f4:       e8bd8008        pop     {r3, pc}
-GCC assumes memset returns the value of pointer 'waiter' in register r0; causing
-register/memory corruptions.
-This patch fixes the return value of the assembly version of memset.
-It adds a 'mov' instruction and merges an additional load+store into
-existing load/store instructions.
-For ease of review, here is a breakdown of the patch into 4 simple steps:
-Step 1
-======
-Perform the following substitutions:
-ip -> r8, then
-r0 -> ip,
-and insert 'mov ip, r0' as the first statement of the function.
-At this point, we have a memset() implementation returning the proper result,
-but corrupting r8 on some paths (the ones that were using ip).
-Step 2
-======
-Make sure r8 is saved and restored when (! CALGN(1)+0) == 1:
-save r8:
-       str     lr, [sp, #-4]!
-+       stmfd   sp!, {r8, lr}
-and restore r8 on both exit paths:
-       ldmeqfd sp!, {pc}               @ Now <64 bytes to go.
-+       ldmeqfd sp!, {r8, pc}           @ Now <64 bytes to go.
-(...)
-        tst     r2, #16
-        stmneia ip!, {r1, r3, r8, lr}
-       ldr     lr, [sp], #4
-+       ldmfd   sp!, {r8, lr}
-Step 3
-======
-Make sure r8 is saved and restored when (! CALGN(1)+0) == 0:
-save r8:
-       stmfd   sp!, {r4-r7, lr}
-+       stmfd   sp!, {r4-r8, lr}
-and restore r8 on both exit paths:
-        bgt     3b
-       ldmeqfd sp!, {r4-r7, pc}
-+       ldmeqfd sp!, {r4-r8, pc}
-(...)
-        tst     r2, #16
-        stmneia ip!, {r4-r7}
-       ldmfd   sp!, {r4-r7, lr}
-+       ldmfd   sp!, {r4-r8, lr}
-Step 4
-======
-Rewrite register list "r4-r7, r8" as "r4-r8".
-Upstream-Status: Pending
-Signed-off-by: Ivan Djelic <ivan.djelic@parrot.com>
-Reviewed-by: Nicolas Pitre <nico@linaro.org>
-Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-(cherry picked from commit 455bd4c430b0c0a361f38e8658a0d6cb469942b5)
---
- arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++-------------------------
- 1 file changed, 44 insertions(+), 41 deletions(-)
-diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
-index 650d592..d912e73 100644
--- a/arch/arm/lib/memset.S
-+++ b/arch/arm/lib/memset.S
-@@ -19,9 +19,9 @@
- 1:     subs    r2, r2, #4              @ 1 do we have enough
-        blt     5f                      @ 1 bytes to align with?
-        cmp     r3, #2                  @ 1
-       strltb  r1, [r0], #1            @ 1
-       strleb  r1, [r0], #1            @ 1
-       strb    r1, [r0], #1            @ 1
-+       strltb  r1, [ip], #1            @ 1
-+       strleb  r1, [ip], #1            @ 1
-+       strb    r1, [ip], #1            @ 1
-        add     r2, r2, r3              @ 1 (r2 = r2 - (4 - r3))
- /*
-  * The pointer is now aligned and the length is adjusted.  Try doing the
-@@ -29,10 +29,14 @@
-  */
- 
- ENTRY(memset)
-       ands    r3, r0, #3              @ 1 unaligned?
-+/*
-+ * Preserve the contents of r0 for the return value.
-+ */
-+       mov     ip, r0
-+       ands    r3, ip, #3              @ 1 unaligned?
-        bne     1b                      @ 1
- /*
- * we know that the pointer in r0 is aligned to a word boundary.
-+ * we know that the pointer in ip is aligned to a word boundary.
-  */
-        orr     r1, r1, r1, lsl #8
-        orr     r1, r1, r1, lsl #16
-@@ -43,29 +47,28 @@ ENTRY(memset)
- #if ! CALGN(1)+0
- 
- /*
- * We need an extra register for this loop - save the return address and
- * use the LR
-+ * We need 2 extra registers for this loop - use r8 and the LR
-  */
-       str     lr, [sp, #-4]!
-       mov     ip, r1
-+       stmfd   sp!, {r8, lr}
-+       mov     r8, r1
-        mov     lr, r1
- 
- 2:     subs    r2, r2, #64
-       stmgeia r0!, {r1, r3, ip, lr}   @ 64 bytes at a time.
-       stmgeia r0!, {r1, r3, ip, lr}
-       stmgeia r0!, {r1, r3, ip, lr}
-       stmgeia r0!, {r1, r3, ip, lr}
-+       stmgeia ip!, {r1, r3, r8, lr}   @ 64 bytes at a time.
-+       stmgeia ip!, {r1, r3, r8, lr}
-+       stmgeia ip!, {r1, r3, r8, lr}
-+       stmgeia ip!, {r1, r3, r8, lr}
-        bgt     2b
-       ldmeqfd sp!, {pc}               @ Now <64 bytes to go.
-+       ldmeqfd sp!, {r8, pc}           @ Now <64 bytes to go.
- /*
-  * No need to correct the count; we're only testing bits from now on
-  */
-        tst     r2, #32
-       stmneia r0!, {r1, r3, ip, lr}
-       stmneia r0!, {r1, r3, ip, lr}
-+       stmneia ip!, {r1, r3, r8, lr}
-+       stmneia ip!, {r1, r3, r8, lr}
-        tst     r2, #16
-       stmneia r0!, {r1, r3, ip, lr}
-       ldr     lr, [sp], #4
-+       stmneia ip!, {r1, r3, r8, lr}
-+       ldmfd   sp!, {r8, lr}
- 
- #else
- 
-@@ -74,54 +77,54 @@ ENTRY(memset)
-  * whole cache lines at once.
-  */
- 
-       stmfd   sp!, {r4-r7, lr}
-+       stmfd   sp!, {r4-r8, lr}
-        mov     r4, r1
-        mov     r5, r1
-        mov     r6, r1
-        mov     r7, r1
-       mov     ip, r1
-+       mov     r8, r1
-        mov     lr, r1
- 
-        cmp     r2, #96
-       tstgt   r0, #31
-+       tstgt   ip, #31
-        ble     3f
- 
-       and     ip, r0, #31
-       rsb     ip, ip, #32
-       sub     r2, r2, ip
-       movs    ip, ip, lsl #(32 - 4)
-       stmcsia r0!, {r4, r5, r6, r7}
-       stmmiia r0!, {r4, r5}
-       tst     ip, #(1 << 30)
-       mov     ip, r1
-       strne   r1, [r0], #4
-+       and     r8, ip, #31
-+       rsb     r8, r8, #32
-+       sub     r2, r2, r8
-+       movs    r8, r8, lsl #(32 - 4)
-+       stmcsia ip!, {r4, r5, r6, r7}
-+       stmmiia ip!, {r4, r5}
-+       tst     r8, #(1 << 30)
-+       mov     r8, r1
-+       strne   r1, [ip], #4
- 
- 3:     subs    r2, r2, #64
-       stmgeia r0!, {r1, r3-r7, ip, lr}
-       stmgeia r0!, {r1, r3-r7, ip, lr}
-+       stmgeia ip!, {r1, r3-r8, lr}
-+       stmgeia ip!, {r1, r3-r8, lr}
-        bgt     3b
-       ldmeqfd sp!, {r4-r7, pc}
-+       ldmeqfd sp!, {r4-r8, pc}
- 
-        tst     r2, #32
-       stmneia r0!, {r1, r3-r7, ip, lr}
-+       stmneia ip!, {r1, r3-r8, lr}
-        tst     r2, #16
-       stmneia r0!, {r4-r7}
-       ldmfd   sp!, {r4-r7, lr}
-+       stmneia ip!, {r4-r7}
-+       ldmfd   sp!, {r4-r8, lr}
- 
- #endif
- 
- 4:     tst     r2, #8
-       stmneia r0!, {r1, r3}
-+       stmneia ip!, {r1, r3}
-        tst     r2, #4
-       strne   r1, [r0], #4
-+       strne   r1, [ip], #4
- /*
-  * When we get here, we've got less than 4 bytes to zero.  We
-  * may have an unaligned pointer as well.
-  */
- 5:     tst     r2, #2
-       strneb  r1, [r0], #1
-       strneb  r1, [r0], #1
-+       strneb  r1, [ip], #1
-+       strneb  r1, [ip], #1
-        tst     r2, #1
-       strneb  r1, [r0], #1
-+       strneb  r1, [ip], #1
-        mov     pc, lr
- ENDPROC(memset)
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch
deleted file mode 100644
index b8d6f53..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 2ba23fa6c4128febaaf57fe184420a7111caa237 Mon Sep 17 00:00:00 2001
-From: Nicolas Pitre <nicolas.pitre@linaro.org>
-Date: Tue, 12 Mar 2013 13:00:42 +0100
-Subject: [PATCH] ARM: 7670/1: fix the memset fix
-Organization: O.S. Systems Software LTDA.
-Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by
-recent GCC (4.7.2) optimizations") attempted to fix a compliance issue
-with the memset return value.  However the memset itself became broken
-by that patch for misaligned pointers.
-This fixes the above by branching over the entry code from the
-misaligned fixup code to avoid reloading the original pointer.
-Also, because the function entry alignment is wrong in the Thumb mode
-compilation, that fixup code is moved to the end.
-While at it, the entry instructions are slightly reworked to help dual
-issue pipelines.
-Upstream-Status: Pending
-Signed-off-by: Nicolas Pitre <nico@linaro.org>
-Tested-by: Alexander Holler <holler@ahsoftware.de>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-(cherry picked from commit 418df63adac56841ef6b0f1fcf435bc64d4ed177)
---
- arch/arm/lib/memset.S | 33 +++++++++++++--------------------
- 1 file changed, 13 insertions(+), 20 deletions(-)
-diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
-index d912e73..94b0650 100644
--- a/arch/arm/lib/memset.S
-+++ b/arch/arm/lib/memset.S
-@@ -14,31 +14,15 @@
- 
-        .text
-        .align  5
-       .word   0
-
-1:     subs    r2, r2, #4              @ 1 do we have enough
-       blt     5f                      @ 1 bytes to align with?
-       cmp     r3, #2                  @ 1
-       strltb  r1, [ip], #1            @ 1
-       strleb  r1, [ip], #1            @ 1
-       strb    r1, [ip], #1            @ 1
-       add     r2, r2, r3              @ 1 (r2 = r2 - (4 - r3))
-/*
- * The pointer is now aligned and the length is adjusted.  Try doing the
- * memset again.
- */
- 
- ENTRY(memset)
-/*
- * Preserve the contents of r0 for the return value.
- */
-       mov     ip, r0
-       ands    r3, ip, #3              @ 1 unaligned?
-       bne     1b                      @ 1
-+       ands    r3, r0, #3              @ 1 unaligned?
-+       mov     ip, r0                  @ preserve r0 as return value
-+       bne     6f                      @ 1
- /*
-  * we know that the pointer in ip is aligned to a word boundary.
-  */
-       orr     r1, r1, r1, lsl #8
-+1:     orr     r1, r1, r1, lsl #8
-        orr     r1, r1, r1, lsl #16
-        mov     r3, r1
-        cmp     r2, #16
-@@ -127,4 +111,13 @@ ENTRY(memset)
-        tst     r2, #1
-        strneb  r1, [ip], #1
-        mov     pc, lr
-+
-+6:     subs    r2, r2, #4              @ 1 do we have enough
-+       blt     5b                      @ 1 bytes to align with?
-+       cmp     r3, #2                  @ 1
-+       strltb  r1, [ip], #1            @ 1
-+       strleb  r1, [ip], #1            @ 1
-+       strb    r1, [ip], #1            @ 1
-+       add     r2, r2, r3              @ 1 (r2 = r2 - (4 - r3))
-+       b       1b
- ENDPROC(memset)
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch
deleted file mode 100644
index 7316351..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d8601292ae25e0af47aa4486055221ab44113f0e Mon Sep 17 00:00:00 2001
-From: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
-Date: Mon, 15 Jul 2013 15:34:54 -0500
-Subject: [PATCH] ENGR00271136 Fix build break when CONFIG_CLK_DEBUG is
- disabled
-Organization: O.S. Systems Software LTDA.
-clk structure member name is defined only when CONFIG_CLK_DEBUG is enabled.
-Hence need to encapsulate the code with this config.
-Patch received from imx community:
-https://community.freescale.com/thread/308482
-Upstream-Status: Pending
-Signed-off-by: xiongweihuang
-Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
---
- arch/arm/plat-mxc/clock.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c
-index 93347eb..1aa2664 100755
--- a/arch/arm/plat-mxc/clock.c
-+++ b/arch/arm/plat-mxc/clock.c
-@@ -58,12 +58,12 @@ static void __clk_disable(struct clk *clk)
- {
-        if (clk == NULL || IS_ERR(clk))
-                return;
-
-+#ifdef CONFIG_CLK_DEBUG
-        if (!clk->usecount) {
-                WARN(1, "clock enable/disable mismatch! clk  %s\n", clk->name);
-                return;
-        }
-
-+#endif
-        if (!(--clk->usecount)) {
-                if (clk->disable)
-                        clk->disable(clk);
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch
deleted file mode 100644
index cb20198..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 538f4bb2f7a51f267395550a5be9f0ab2e426712 Mon Sep 17 00:00:00 2001
-From: Erik Boto <erik.boto@pelagicore.com>
-Date: Tue, 16 Jul 2013 12:06:05 -0500
-Subject: [PATCH] ENGR00271359 Add Multi-touch support
-Organization: O.S. Systems Software LTDA.
-The previous behavior of the driver did not work properly with Qt5
-QtQuick multi touch-point gestures, due to how touch-points are
-reported when removing a touch-point. My interpretation of the
-available documentation [1] was that the driver should report all
-touch-points between SYN_REPORTs, but it is not explicitly stated so.
-I've found another mail-thread [2] where the creator of the protocol
-states:
-"The protocol defines a generic way of sending a variable amount of
-contacts. The contact count is obtained by counting the number of
-non-empty finger packets between SYN_REPORT events."-Henrik Rydberg
-I think this verifies my assumption that all touch-points should be
-reported between SYN_REPORTs, otherwise it can not be used to obtain
-the count.
-[1] https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt
-[2] http://lists.x.org/archives/xorg-devel/2010-March/006466.html
-Upstream-Status: Pending
-Signed-off-by: Erik Boto <erik.boto@pelagicore.com>
-Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
-(cherry picked from commit 7cba001c5a502680f6dbf902821726779a9c9287)
---
- drivers/input/touchscreen/egalax_ts.c | 36 +++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
-index 0b6cde7..271f820 100644
--- a/drivers/input/touchscreen/egalax_ts.c
-+++ b/drivers/input/touchscreen/egalax_ts.c
-@@ -133,7 +133,6 @@ retry:
-        }
- 
-        if (down) {
-               /* should also report old pointers */
-                events[id].valid = valid;
-                events[id].status = down;
-                events[id].x = x;
-@@ -144,23 +143,6 @@ retry:
-                input_report_abs(input_dev, ABS_Y, y);
-                input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1);
-                input_report_abs(input_dev, ABS_PRESSURE, 1);
-#else
-               for (i = 0; i < MAX_SUPPORT_POINTS; i++) {
-                       if (!events[i].valid)
-                               continue;
-                       dev_dbg(&client->dev, "report id:%d valid:%d x:%d y:%d",
-                               i, valid, x, y);
-
-                       input_report_abs(input_dev,
-                                        ABS_MT_TRACKING_ID, i);
-                       input_report_abs(input_dev,
-                                        ABS_MT_TOUCH_MAJOR, 1);
-                       input_report_abs(input_dev,
-                                        ABS_MT_POSITION_X, events[i].x);
-                       input_report_abs(input_dev,
-                                        ABS_MT_POSITION_Y, events[i].y);
-                       input_mt_sync(input_dev);
-               }
- #endif
-        } else {
-                dev_dbg(&client->dev, "release id:%d\n", id);
-@@ -176,6 +158,24 @@ retry:
- #endif
-        }
- 
-+#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
-+       /* report all pointers */
-+       for (i = 0; i < MAX_SUPPORT_POINTS; i++) {
-+               if (!events[i].valid)
-+                       continue;
-+               dev_dbg(&client->dev, "report id:%d valid:%d x:%d y:%d",
-+                       i, valid, x, y);
-+                       input_report_abs(input_dev,
-+                                ABS_MT_TRACKING_ID, i);
-+               input_report_abs(input_dev,
-+                                ABS_MT_TOUCH_MAJOR, 1);
-+               input_report_abs(input_dev,
-+                                ABS_MT_POSITION_X, events[i].x);
-+               input_report_abs(input_dev,
-+                                ABS_MT_POSITION_Y, events[i].y);
-+               input_mt_sync(input_dev);
-+       }
-+#endif
-        input_sync(input_dev);
-        return IRQ_HANDLED;
- }
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch
deleted file mode 100644
index 00a6b5c..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 3e6441d113f72b412081a2c87f39011e4c253a35 Mon Sep 17 00:00:00 2001
-From: Robert Winkler <robert.winkler@boundarydevices.com>
-Date: Fri, 19 Jul 2013 19:00:41 -0700
-Subject: [PATCH] Add support for DVI monitors
-Organization: O.S. Systems Software LTDA.
-Upstream-Status: Pending
-Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
---
- arch/arm/plat-mxc/include/mach/mxc_hdmi.h |  7 +++
- drivers/video/mxc_hdmi.c                  | 98 +++++++++++++------------------
- 2 files changed, 49 insertions(+), 56 deletions(-)
-diff --git a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h
-index 94f7638..af59c62 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h
-+++ b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h
-@@ -605,6 +605,10 @@ enum {
-        HDMI_IH_MUTE_PHY_STAT0_TX_PHY_LOCK = 0x2,
-        HDMI_IH_MUTE_PHY_STAT0_HPD = 0x1,
- 
-+/* IH and IH_MUTE convenience macro RX_SENSE | HPD*/
-+       HDMI_DVI_IH_STAT = 0x3D,
-+
-+
- /* IH_AHBDMAAUD_STAT0 field values */
-        HDMI_IH_AHBDMAAUD_STAT0_ERROR = 0x20,
-        HDMI_IH_AHBDMAAUD_STAT0_LOST = 0x10,
-@@ -903,6 +907,9 @@ enum {
-        HDMI_PHY_HPD = 0x02,
-        HDMI_PHY_TX_PHY_LOCK = 0x01,
- 
-+/* HDMI STAT convenience RX_SENSE | HPD */
-+       HDMI_DVI_STAT = 0xF2,
-+
- /* PHY_I2CM_SLAVE_ADDR field values */
-        HDMI_PHY_I2CM_SLAVE_ADDR_PHY_GEN2 = 0x69,
-        HDMI_PHY_I2CM_SLAVE_ADDR_HEAC_PHY = 0x49,
-diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
-index c5069aa..544f352 100644
--- a/drivers/video/mxc_hdmi.c
-+++ b/drivers/video/mxc_hdmi.c
-@@ -180,7 +180,6 @@ struct mxc_hdmi {
-        bool dft_mode_set;
-        char *dft_mode_str;
-        int default_bpp;
-       u8 latest_intr_stat;
-        bool irq_enabled;
-        spinlock_t irq_lock;
-        bool phy_enabled;
-@@ -1996,58 +1995,48 @@ static void hotplug_worker(struct work_struct *work)
-        struct delayed_work *delay_work = to_delayed_work(work);
-        struct mxc_hdmi *hdmi =
-                container_of(delay_work, struct mxc_hdmi, hotplug_work);
-       u32 phy_int_stat, phy_int_pol, phy_int_mask;
-       u8 val;
-+       u32 hdmi_phy_stat0, hdmi_phy_pol0, hdmi_phy_mask0;
-        unsigned long flags;
-        char event_string[32];
-        char *envp[] = { event_string, NULL };
- 
-       phy_int_stat = hdmi->latest_intr_stat;
-       phy_int_pol = hdmi_readb(HDMI_PHY_POL0);
- 
-       dev_dbg(&hdmi->pdev->dev, "phy_int_stat=0x%x, phy_int_pol=0x%x\n",
-                       phy_int_stat, phy_int_pol);
-+       hdmi_phy_stat0 = hdmi_readb(HDMI_PHY_STAT0);
-+       hdmi_phy_pol0 = hdmi_readb(HDMI_PHY_POL0);
-+
-+       dev_dbg(&hdmi->pdev->dev, "hdmi_phy_stat0=0x%x, hdmi_phy_pol0=0x%x\n",
-+                       hdmi_phy_stat0, hdmi_phy_pol0);
-+
-+       /* Make HPD intr active low to capture unplug event or
-+        * active high to capture plugin event */
-+       hdmi_writeb((HDMI_DVI_STAT & ~hdmi_phy_stat0), HDMI_PHY_POL0);
- 
-        /* check cable status */
-       if (phy_int_stat & HDMI_IH_PHY_STAT0_HPD) {
-               /* cable connection changes */
-               if (phy_int_pol & HDMI_PHY_HPD) {
-                       /* Plugin event */
-                       dev_dbg(&hdmi->pdev->dev, "EVENT=plugin\n");
-                       mxc_hdmi_cable_connected(hdmi);
-
-                       /* Make HPD intr active low to capture unplug event */
-                       val = hdmi_readb(HDMI_PHY_POL0);
-                       val &= ~HDMI_PHY_HPD;
-                       hdmi_writeb(val, HDMI_PHY_POL0);
-
-                       sprintf(event_string, "EVENT=plugin");
-                       kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
-+       if (hdmi_phy_stat0 & HDMI_DVI_STAT) {
-+               /* Plugin event */
-+               dev_dbg(&hdmi->pdev->dev, "EVENT=plugin\n");
-+               mxc_hdmi_cable_connected(hdmi);
-+
-+               sprintf(event_string, "EVENT=plugin");
-+               kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
- #ifdef CONFIG_MXC_HDMI_CEC
-                       mxc_hdmi_cec_handle(0x80);
-+               mxc_hdmi_cec_handle(0x80);
- #endif
-                       hdmi_set_cable_state(1);
-
-               } else if (!(phy_int_pol & HDMI_PHY_HPD)) {
-                       /* Plugout event */
-                       dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n");
-                       hdmi_set_cable_state(0);
-                       mxc_hdmi_abort_stream();
-                       mxc_hdmi_cable_disconnected(hdmi);
-+               hdmi_set_cable_state(1);
- 
-                       /* Make HPD intr active high to capture plugin event */
-                       val = hdmi_readb(HDMI_PHY_POL0);
-                       val |= HDMI_PHY_HPD;
-                       hdmi_writeb(val, HDMI_PHY_POL0);
-+       } else {
-+               /* Plugout event */
-+               dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n");
-+               hdmi_set_cable_state(0);
-+               mxc_hdmi_abort_stream();
-+               mxc_hdmi_cable_disconnected(hdmi);
- 
-                       sprintf(event_string, "EVENT=plugout");
-                       kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
-+               sprintf(event_string, "EVENT=plugout");
-+               kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp);
- #ifdef CONFIG_MXC_HDMI_CEC
-                       mxc_hdmi_cec_handle(0x100);
-+               mxc_hdmi_cec_handle(0x100);
- #endif
- 
-               } else
-                       dev_dbg(&hdmi->pdev->dev, "EVENT=none?\n");
-        }
- 
-        /* Lock here to ensure full powerdown sequence
-@@ -2055,12 +2044,12 @@ static void hotplug_worker(struct work_struct *work)
-        spin_lock_irqsave(&hdmi->irq_lock, flags);
- 
-        /* Re-enable HPD interrupts */
-       phy_int_mask = hdmi_readb(HDMI_PHY_MASK0);
-       phy_int_mask &= ~HDMI_PHY_HPD;
-       hdmi_writeb(phy_int_mask, HDMI_PHY_MASK0);
-+       hdmi_phy_mask0 = hdmi_readb(HDMI_PHY_MASK0);
-+       hdmi_phy_mask0 &= ~HDMI_DVI_STAT;
-+       hdmi_writeb(hdmi_phy_mask0, HDMI_PHY_MASK0);
- 
-        /* Unmute interrupts */
-       hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
-+       hdmi_writeb(~HDMI_DVI_IH_STAT, HDMI_IH_MUTE_PHY_STAT0);
- 
-        if (hdmi_readb(HDMI_IH_FC_STAT2) & HDMI_IH_FC_STAT2_OVERFLOW_MASK)
-                mxc_hdmi_clear_overflow();
-@@ -2086,7 +2075,7 @@ static void hdcp_hdp_worker(struct work_struct *work)
- static irqreturn_t mxc_hdmi_hotplug(int irq, void *data)
- {
-        struct mxc_hdmi *hdmi = data;
-       u8 val, intr_stat;
-+       u8 val;
-        unsigned long flags;
- 
-        spin_lock_irqsave(&hdmi->irq_lock, flags);
-@@ -2108,25 +2097,22 @@ static irqreturn_t mxc_hdmi_hotplug(int irq, void *data)
-         * HDMI registers.
-         */
-        /* Capture status - used in hotplug_worker ISR */
-       intr_stat = hdmi_readb(HDMI_IH_PHY_STAT0);
-
-       if (intr_stat & HDMI_IH_PHY_STAT0_HPD) {
-+       if (hdmi_readb(HDMI_IH_PHY_STAT0) & HDMI_DVI_IH_STAT) {
- 
-                dev_dbg(&hdmi->pdev->dev, "Hotplug interrupt received\n");
-               hdmi->latest_intr_stat = intr_stat;
- 
-                /* Mute interrupts until handled */
- 
-                val = hdmi_readb(HDMI_IH_MUTE_PHY_STAT0);
-               val |= HDMI_IH_MUTE_PHY_STAT0_HPD;
-+               val |= HDMI_DVI_IH_STAT;
-                hdmi_writeb(val, HDMI_IH_MUTE_PHY_STAT0);
- 
-                val = hdmi_readb(HDMI_PHY_MASK0);
-               val |= HDMI_PHY_HPD;
-+               val |= HDMI_DVI_STAT;
-                hdmi_writeb(val, HDMI_PHY_MASK0);
- 
-                /* Clear Hotplug interrupts */
-               hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
-+               hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0);
- 
-                schedule_delayed_work(&(hdmi->hotplug_work), msecs_to_jiffies(20));
-        }
-@@ -2282,13 +2268,13 @@ static void mxc_hdmi_fb_registered(struct mxc_hdmi *hdmi)
-                    HDMI_PHY_I2CM_CTLINT_ADDR);
- 
-        /* enable cable hot plug irq */
-       hdmi_writeb((u8)~HDMI_PHY_HPD, HDMI_PHY_MASK0);
-+       hdmi_writeb((u8)~HDMI_DVI_STAT, HDMI_PHY_MASK0);
- 
-        /* Clear Hotplug interrupts */
-       hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
-+       hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0);
- 
-        /* Unmute interrupts */
-       hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0);
-+       hdmi_writeb(~HDMI_DVI_IH_STAT, HDMI_IH_MUTE_PHY_STAT0);
- 
-        hdmi->fb_reg = true;
- 
-@@ -2522,10 +2508,10 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp,
- 
-        /* Configure registers related to HDMI interrupt
-         * generation before registering IRQ. */
-       hdmi_writeb(HDMI_PHY_HPD, HDMI_PHY_POL0);
-+       hdmi_writeb(HDMI_DVI_STAT, HDMI_PHY_POL0);
- 
-        /* Clear Hotplug interrupts */
-       hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0);
-+       hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0);
- 
-        hdmi->nb.notifier_call = mxc_hdmi_fb_event;
-        ret = fb_register_client(&hdmi->nb);
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
deleted file mode 100644
index d02aa40..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <fabio.estevam@freescale.com>
-Date: Sat, 28 Sep 2013 18:46:18 -0300
-Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first
-Organization: O.S. Systems Software LTDA.
-On sabresd boards we boot from SDHC3, so let's register it as mmc0.
-Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
-Registering SDHC3 is safer as we can always find the rootfs.
-Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
- arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
-index 3f9a845..4e6b323 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
-+++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
-@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void)
- 
-        imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data);
- 
-       /* Move sd4 to first because sd4 connect to emmc.
-          Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1.
-       */
-+       imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
-        imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data);
-        imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data);
-       imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
-        imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata);
-        imx6q_sabresd_init_usb();
-        /* SATA is not supported by MX6DL/Solo */
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch
deleted file mode 100644
index 815d02c..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b37a944f55a5010bd08297a63db0275540922f32 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 22 Aug 2013 16:31:29 -0300
-Subject: [PATCH] drm/vivante: Add ":00" sufix in returned bus Id
-This makes the 3.0.35 compatible with a Xorg driver build for 3.5.7 or
-newer kernels.
-Upstream-Status: Inapropriate [embedded specific]
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
- drivers/gpu/drm/vivante/vivante_drv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/gpu/drm/vivante/vivante_drv.c b/drivers/gpu/drm/vivante/vivante_drv.c
-index 4224608..cea360d 100644
--- a/drivers/gpu/drm/vivante/vivante_drv.c
-+++ b/drivers/gpu/drm/vivante/vivante_drv.c
-@@ -55,7 +55,7 @@
- 
- #include "drm_pciids.h"
- 
-static char platformdevicename[] = "Vivante GCCore";
-+static char platformdevicename[] = "Vivante GCCore:00";
- static struct platform_device *pplatformdev;
- 
- static struct drm_driver driver = {
-- 
-1.8.4.rc1
diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch
deleted file mode 100644
index 0a20b3f..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 149545df26169d257b144ff78934ce9cb5b6818b Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Sat, 19 Oct 2013 10:55:11 -0300
-Subject: [PATCH] epdc: Rename mxcfb_epdc_kernel.h to mxc_epdc.h
-Organization: O.S. Systems Software LTDA.
-This allow for forward compatibility with imx-test >= 3.10.9-1.0.0.
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
- drivers/video/mxc/mxc_epdc_fb.c   |  2 +-
- include/linux/mxcfb_epdc.h        | 49 +++++++++++++++++++++++++++++++++++++++
- include/linux/mxcfb_epdc_kernel.h | 49 ---------------------------------------
- 3 files changed, 50 insertions(+), 50 deletions(-)
- create mode 100644 include/linux/mxcfb_epdc.h
- delete mode 100644 include/linux/mxcfb_epdc_kernel.h
-diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c
-index 4103498..b3ef8ea 100644
--- a/drivers/video/mxc/mxc_epdc_fb.c
-+++ b/drivers/video/mxc/mxc_epdc_fb.c
-@@ -43,7 +43,7 @@
- #include <linux/dmaengine.h>
- #include <linux/pxp_dma.h>
- #include <linux/mxcfb.h>
-#include <linux/mxcfb_epdc_kernel.h>
-+#include <linux/mxcfb_epdc.h>
- #include <linux/gpio.h>
- #include <linux/regulator/driver.h>
- #include <linux/fsl_devices.h>
-diff --git a/include/linux/mxcfb_epdc.h b/include/linux/mxcfb_epdc.h
-new file mode 100644
-index 0000000..06fea6f
--- /dev/null
-+++ b/include/linux/mxcfb_epdc.h
-@@ -0,0 +1,49 @@
-+/*
-+ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved.
-+ *
-+ * 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; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+#ifndef _MXCFB_EPDC_KERNEL
-+#define _MXCFB_EPDC_KERNEL
-+
-+void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
-+                                               struct fb_info *info);
-+int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info);
-+int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
-+int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data,
-+                                  struct fb_info *info);
-+int mxc_epdc_fb_wait_update_complete(
-+                               struct mxcfb_update_marker_data *marker_data,
-+                               struct fb_info *info);
-+int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
-+                                           struct fb_info *info);
-+int mxc_epdc_get_pwrdown_delay(struct fb_info *info);
-+int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
-+
-+void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
-+                                               struct fb_info *info);
-+int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info);
-+int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
-+int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data,
-+                                  struct fb_info *info);
-+int mxc_spdc_fb_wait_update_complete(
-+                               struct mxcfb_update_marker_data *marker_data,
-+                               struct fb_info *info);
-+int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
-+                                           struct fb_info *info);
-+int mxc_spdc_get_pwrdown_delay(struct fb_info *info);
-+int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
-+#endif
-diff --git a/include/linux/mxcfb_epdc_kernel.h b/include/linux/mxcfb_epdc_kernel.h
-deleted file mode 100644
-index 06fea6f..0000000
--- a/include/linux/mxcfb_epdc_kernel.h
-+++ /dev/null
-@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-#ifndef _MXCFB_EPDC_KERNEL
-#define _MXCFB_EPDC_KERNEL
-
-void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
-                                               struct fb_info *info);
-int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info);
-int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
-int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data,
-                                  struct fb_info *info);
-int mxc_epdc_fb_wait_update_complete(
-                               struct mxcfb_update_marker_data *marker_data,
-                               struct fb_info *info);
-int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
-                                           struct fb_info *info);
-int mxc_epdc_get_pwrdown_delay(struct fb_info *info);
-int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
-
-void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes,
-                                               struct fb_info *info);
-int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info);
-int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info);
-int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data,
-                                  struct fb_info *info);
-int mxc_spdc_fb_wait_update_complete(
-                               struct mxcfb_update_marker_data *marker_data,
-                               struct fb_info *info);
-int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay,
-                                           struct fb_info *info);
-int mxc_spdc_get_pwrdown_delay(struct fb_info *info);
-int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info);
-#endif
-- 
-1.8.4.rc3
diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
deleted file mode 100644
index 69adc4f..0000000
--- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2011-2013 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-require recipes-kernel/linux/linux-imx.inc
-COMPATIBLE_MACHINE = "(mx6)"
-# Revision of 4.1.0 branch
-SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a"
-LOCALVERSION = "-4.1.0+yocto"
-# Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch
-SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
-            file://epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch \
-            file://0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch \
-            file://0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch \
-            file://0003-ARM-7670-1-fix-the-memset-fix.patch \
-            file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \
-            file://0005-ENGR00271359-Add-Multi-touch-support.patch \
-            file://0006-Add-support-for-DVI-monitors.patch \
-            file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch"
-# kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
-do_configure_prepend() {
-cat <<EOF >> ${WORKDIR}/defconfig
-# FunctionFS for adb
-CONFIG_USB_FUNCTIONFS=m
-# Enable USB serial support
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_ACM=m
-# Control group support
-CONFIG_CGROUPS=y
-# Open by fhandle syscalls
-CONFIG_FHANDLE=y
-CONFIG_EXPORTFS=y
-# Namespaces support
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-EOF
-}
-# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
-PRINC = "-1"
diff --git a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
deleted file mode 100644
index b884e43..0000000
--- a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require u-boot.inc
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
-DEPENDS_mxs += "elftosb-native openssl-native"
-PROVIDES += "u-boot"
-PV = "v2013.10"
-SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
-SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=patches-2013.10"
-S = "${WORKDIR}/git"
-# FIXME: Allow linking of 'tools' binaries with native libraries
-#        used for generating the boot logo and other tools used
-#        during the build process.
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
-                 HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \
-                 HOSTSTRIP=true'
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-# bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
-PRINC = "-1"
diff --git a/meta-architech-extras/recipes/u-boot/u-boot.inc b/meta-architech-extras/recipes/u-boot/u-boot.inc
deleted file mode 100644
index ae215cd..0000000
--- a/meta-architech-extras/recipes/u-boot/u-boot.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-DESCRIPTION = "U-Boot - the Universal Boot Loader"
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-PROVIDES = "virtual/bootloader"
-inherit uboot-config deploy
-EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
-# Allow setting an additional version string that will be picked up by the
-# u-boot build system and appended to the u-boot version.  If the .scmversion
-# file already exists it will not be overwritten.
-UBOOT_LOCALVERSION ?= ""
-# Some versions of u-boot use .bin and others use .img.  By default use .bin
-# but enable individual recipes to change this value.
-UBOOT_SUFFIX ?= "bin"
-UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
-UBOOT_MAKE_TARGET ?= "all"
-# Some versions of u-boot build an SPL (Second Program Loader) image that
-# should be packaged along with the u-boot binary as well as placed in the
-# deploy directory.  For those versions they can set the following variables
-# to allow packaging the SPL.
-SPL_BINARY ?= ""
-SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
-SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
-do_compile () {
-    if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
-        sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
-    fi
-    unset LDFLAGS
-    unset CFLAGS
-    unset CPPFLAGS
-    if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-    then
-        echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
-        echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
-    fi
-    oe_runmake ${UBOOT_MACHINE}
-    oe_runmake ${UBOOT_MAKE_TARGET}
-}
-do_install () {
-    install -d ${D}/boot
-    install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
-    ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
-    if [ -e ${WORKDIR}/fw_env.config ] ; then
-        install -d ${D}${sysconfdir}
-        install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
-    fi
-    if [ "x${SPL_BINARY}" != "x" ]
-    then
-        install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
-        ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
-    fi
-}
-FILES_${PN} = "/boot ${sysconfdir}"
-FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
-do_deploy () {
-    install -d ${DEPLOYDIR}
-    install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-    cd ${DEPLOYDIR}
-    rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
-    ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
-    ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
-    if [ "x${SPL_BINARY}" != "x" ]
-    then
-        install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
-        rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
-        ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
-        ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
-    fi
-}
-addtask deploy before do_build after do_compile
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/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-fslc-imx_3.14-1.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-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-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-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-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-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..f8fac0d 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.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
    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index dfc24a1..5a92f25 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -29,7 +29,7 @@
 RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
-do_configure_prepend () {
+do_preconfigure_prepend () {
    # FunctionFS for adb
    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/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/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
index 44e94d5..bb86181 100644
--- a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
+++ b/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "fe2807312ff3d2285b51a4de363b1c1fb8d85f82"
+SYSTEMD_SERVICE_${PN}_raspberrypi3 = "brcm43438.service bluetooth.service"
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
index 586b2b5..13ac255 100644
--- a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-PACKAGECONFIG_remove = "gles2"
+EXTRA_OECONF_append_rpi = " LDFLAGS='-lbcm_host'"
diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
index b421e1d..2aec751 100644
--- a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
+++ b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
@@ -28,3 +28,9 @@
 ############################################################################
 COMPATIBLE_MACHINE = ""
+FILESEXTRAPATHS_prepend := "${THISDIR}/../linux/linux-renesas:"
+SRC_URI += " \
+    file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \
+    "
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch b/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch
new file mode 100644
index 0000000..b495d39
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch
@@ -0,0 +1,124 @@
+From 57254b6ebce4ceca02d9c8b615f6059c56c19238 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <list.btrfs@jan-o-sch.net>
+Date: Mon, 6 May 2013 19:14:17 +0000
+Subject: [PATCH] Btrfs: add ioctl to wait for qgroup rescan completion
+btrfs_qgroup_wait_for_completion waits until the currently running qgroup
+operation completes. It returns immediately when no rescan process is in
+progress. This is useful to automate things around the rescan process (e.g.
+testing).
+Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
+Signed-off-by: Josef Bacik <jbacik@fusionio.com>
+---
+ fs/btrfs/ctree.h           |  2 ++
+ fs/btrfs/ioctl.c           | 12 ++++++++++++
+ fs/btrfs/qgroup.c          | 21 +++++++++++++++++++++
+ include/uapi/linux/btrfs.h |  1 +
+ 4 files changed, 36 insertions(+)
+diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
+index a365400..e36e97b 100644
+--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
+@@ -1613,6 +1613,7 @@ struct btrfs_fs_info {
+        struct mutex qgroup_rescan_lock; /* protects the progress item */
+        struct btrfs_key qgroup_rescan_progress;
+        struct btrfs_workers qgroup_rescan_workers;
+       struct completion qgroup_rescan_completion;
+ 
+        /* filesystem state */
+        unsigned long fs_state;
+@@ -3820,6 +3821,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans,
+ int btrfs_quota_disable(struct btrfs_trans_handle *trans,
+                        struct btrfs_fs_info *fs_info);
+ int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info);
+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info);
+ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
+                              struct btrfs_fs_info *fs_info, u64 src, u64 dst);
+ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
+diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
+index 0f81d67..1e0dda1 100644
+--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
+@@ -3937,6 +3937,16 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
+        return ret;
+ }
+ 
+static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg)
+{
+       struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       return btrfs_qgroup_wait_for_completion(root->fs_info);
+}
+
+ static long btrfs_ioctl_set_received_subvol(struct file *file,
+                                            void __user *arg)
+ {
+@@ -4179,6 +4189,8 @@ long btrfs_ioctl(struct file *file, unsigned int
+                return btrfs_ioctl_quota_rescan(file, argp);
+        case BTRFS_IOC_QUOTA_RESCAN_STATUS:
+                return btrfs_ioctl_quota_rescan_status(file, argp);
+       case BTRFS_IOC_QUOTA_RESCAN_WAIT:
+               return btrfs_ioctl_quota_rescan_wait(file, argp);
+        case BTRFS_IOC_DEV_REPLACE:
+                return btrfs_ioctl_dev_replace(root, argp);
+        case BTRFS_IOC_GET_FSLABEL:
+diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
+index 7f38cce..d059d86 100644
+--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
+@@ -2070,6 +2070,8 @@ out:
+        } else {
+                pr_err("btrfs: qgroup scan failed with %d\n", err);
+        }
+
+       complete_all(&fs_info->qgroup_rescan_completion);
+ }
+ 
+ static void
+@@ -2110,6 +2112,7 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)
+        fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_RESCAN;
+        memset(&fs_info->qgroup_rescan_progress, 0,
+                sizeof(fs_info->qgroup_rescan_progress));
+       init_completion(&fs_info->qgroup_rescan_completion);
+ 
+        /* clear all current qgroup tracking information */
+        for (n = rb_first(&fs_info->qgroup_tree); n; n = rb_next(n)) {
+@@ -2126,3 +2129,21 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info)
+ 
+        return 0;
+ }
+
+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info)
+{
+       int running;
+       int ret = 0;
+
+       mutex_lock(&fs_info->qgroup_rescan_lock);
+       spin_lock(&fs_info->qgroup_lock);
+       running = fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN;
+       spin_unlock(&fs_info->qgroup_lock);
+       mutex_unlock(&fs_info->qgroup_rescan_lock);
+
+       if (running)
+               ret = wait_for_completion_interruptible(
+                                       &fs_info->qgroup_rescan_completion);
+
+       return ret;
+}
+diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
+index 5ef0df5..5b683b5 100644
+--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
+@@ -530,6 +530,7 @@ struct btrfs_ioctl_send_args {
+                               struct btrfs_ioctl_quota_rescan_args)
+ #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
+                               struct btrfs_ioctl_quota_rescan_args)
+#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
+ #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
+                                   char[BTRFS_LABEL_SIZE])
+ #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
index d5e05f0..0309846 100644
--- a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
+++ b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend
@@ -29,7 +29,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
+SRC_URI += " \
-file://b2qt.cfg \
+    file://b2qt.cfg \
-"
+    file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \
+    "
diff --git a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
index 48a4085..af414ad 100644
--- a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch
+++ b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch
@@ -1,4 +1,4 @@
-From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001
+From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 18 Nov 2015 10:14:18 +0200
 Subject: [PATCH] Remove qgltf
@@ -12,14 +12,11 @@ Task-number: QTBUG-49153
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/tools/tools.pro b/tools/tools.pro
-index 055f412..c1eba7f 100644
+index 09c7d8e..8f093ce 100644
 --- a/tools/tools.pro
 +++ b/tools/tools.pro
 @@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = qgltf
+-!android:SUBDIRS += qgltf
-+#SUBDIRS = qgltf
+#!android:SUBDIRS += qgltf
 qgltf.CONFIG += host_build
-- 
-1.9.1
diff --git a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend b/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend
index 6420f50..d32d0e6 100644
--- a/meta-architech-extras/recipes/bootscript/tibidabo-bootscript-sd_1.0.bbappend
+++ b/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend
@@ -28,6 +28,7 @@
 ############################################################################
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Updated-kernel-arguments-for-tibidabo.patch \
+SRC_URI_append_class-target = " \
-        "
+    file://0001-Remove-qgltf.patch \
+    "
diff --git a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend b/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend
index ead9a7f..f35b662 100644
--- a/meta-architech-extras/recipes/gstreamer/gstreamer1.0-plugins-imx_0.%.bbappend
+++ b/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-DEPENDS_remove = "imx-gpu-viv"
+DEPENDS_append_class-target = " virtual/mesa"
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
index 1bcbb80..574e60b 100644
--- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -34,7 +34,7 @@ SRC_URI += " \
    file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
    "
-do_configure_prepend() {
+do_preconfigure_prepend() {
    sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
        -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
        -i ${WORKDIR}/defconfig
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
deleted file mode 100644
index 6fe139e..0000000
--- a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-Name: libdrm
-Description: Userspace interface to kernel DRM services
-Version: 2.4.66
-Libs: -L${libdir} -ldrm
-Cflags: -I${includedir} -I${includedir}/libdrm
diff --git a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
index 4abb469..8770c65 100644
--- a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
@@ -27,5 +27,4 @@
 ##
 ############################################################################
-DEPENDS += "graphics-headers"
 PACKAGECONFIG += "kms"
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/bb-org-overlays/bb-org-overlays_git.bb
index 3d909f9..34a85a3 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/meta-ti-extras/recipes/bb-org-overlays/bb-org-overlays_git.bb
@@ -27,24 +27,27 @@
 ##
 ############################################################################
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+DESCRIPTION = "Device Tree Overlays for bb.org boards"
+HOMEPAGE = "https://github.com/beagleboard/bb.org-overlays"
+SECTION = "kernel"
+LICENSE = "GPLv2"
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-do_install_append() {
+DEPENDS += "dtc-native"
-    echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
-}
+SRC_URI = "git://github.com/beagleboard/bb.org-overlays"
+SRCREV = "c34e3ee970befc511c57e7a42791e588e029b226"
+COMPATIBLE_MACHINE = "(beaglebone)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+S = "${WORKDIR}/git"
-# Inhibit warnings about files being stripped.
+export DTC = "dtc"
-INHIBIT_PACKAGE_STRIP = "1"
-pkg_postinst_${PN}_append() {
+do_install() {
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
+    oe_runmake install DESTDIR="${D}"
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
 }
-RRECOMMENDS_${PN} = "omap3-sgx-modules"
+FILES_${PN} += "/lib/firmware"
-RRECOMMENDS_${PN}-blitwsegl = ""
-RRECOMMENDS_${PN}-flipwsegl = ""
-RRECOMMENDS_${PN}-frontwsegl = ""
-RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/meta-ti-extras/recipes/dtc/dtc/0001-fdtdump-Add-live-tree-dump-capability.patch b/meta-ti-extras/recipes/dtc/dtc/0001-fdtdump-Add-live-tree-dump-capability.patch
new file mode 100644
index 0000000..372a430
--- /dev/null
+++ b/meta-ti-extras/recipes/dtc/dtc/0001-fdtdump-Add-live-tree-dump-capability.patch
@@ -0,0 +1,212 @@
+From da5c33dd94949fa27243faf15cd87e98c53ccb29 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+Date: Tue, 5 Nov 2013 10:16:14 +0200
+Subject: [PATCH] fdtdump: Add live tree dump capability
+Adds the capability to dump any point of the kernel's live tree
+which resides usually in /proc/device-tree.
+For example you can do this:
+        # fdtdump /proc/device-tree/ocp/ethernet\@4a100000/
+        /* dump of live tree at /proc/device-tree/ocp/ethernet@4a100000 */
+        / {
+                name = "ethernet";
+                pinctrl-1 = <0x0000000b>;
+                pinctrl-0 = <0x0000000a>;
+                pinctrl-names = "default", "sleep";
+                ranges;
+                interrupts = <0x00000028 0x00000000 0x00000000 0x00000000>;
+                interrupt-parent = <0x00000001>;
+                #size-cells = <0x00000001>;
+                #address-cells = <0x00000001>;
+                reg = <0x4a100000 0x00000000 0x00000000 0x00000000>;
+                cpts_clock_shift = <0x0000001d>;
+                cpts_clock_mult = <0x80000000>;
+                active_slave = <0x00000000>;
+                slaves = <0x00000002>;
+                mac_control = <0x00000020>;
+                rx_descs = <0x00000040>;
+                no_bd_ram = <0x00000000>;
+                bd_ram_size = <0x00002000>;
+                ale_entries = <0x00000400>;
+                cpdma_channels = <0x00000008>;
+                ti,hwmods = "cpgmac0";
+                compatible = "ti,cpsw";
+                slave@4a100300 {
+                        name = "slave";
+                        phy-mode = "mii";
+                        phy_id = <0x0000000e 0x00000000>;
+                        mac-address = [00 00 00 00 00 00];
+                };
+                slave@4a100200 {
+                        name = "slave";
+                        phy-mode = "mii";
+                        phy_id = <0x0000000e 0x00000000>;
+                        mac-address = [00 00 00 00 00 00];
+                };
+                mdio@4a101000 {
+                        name = "mdio";
+                        phandle = <0x0000000e>;
+                        linux,phandle = <0x0000000e>;
+                        pinctrl-1 = <0x0000000d>;
+                        pinctrl-0 = <0x0000000c>;
+                        pinctrl-names = "default", "sleep";
+                        reg = <0x4a101000 0x00000000>;
+                        bus_freq = <0x000f4240>;
+                        ti,hwmods = "davinci_mdio";
+                        #size-cells = <0x00000000>;
+                        #address-cells = <0x00000001>;
+                        compatible = "ti,davinci_mdio";
+                };
+        };
+This makes it much easier to see the state of the kernel's live tree.
+Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+---
+ fdtdump.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
+diff --git a/fdtdump.c b/fdtdump.c
+index 95a6a20..9183555 100644
+--- a/fdtdump.c
+++ b/fdtdump.c
+@@ -8,6 +8,14 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <alloca.h>
+#include <dirent.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+ 
+ #include <libfdt.h>
+ #include <libfdt_env.h>
+@@ -143,6 +151,95 @@ static void dump_blob(void *blob, bool debug)
+        }
+ }
+ 
+static void dump_live_internal(const char *path, bool debug, int depth)
+{
+       int maxsz = strlen(path) + 1 + PATH_MAX;
+       char *new_path = alloca(maxsz + 1);
+       struct stat sb;
+       struct dirent *de;
+       char *buf, *p;
+       int buf_alloc, shift, chunk, left, fd, ret;
+       DIR *d;
+
+       shift = 4;
+       buf_alloc = 4 * 1024;   /* 4K (maximum chunk) */
+       buf = alloca(buf_alloc + sizeof(uint32_t));
+       buf[buf_alloc] = '\0';  /* always terminate (just in case) */
+
+       d = opendir(path);
+       if (d == NULL)
+               die("Could not open %s directory\n", path);
+
+       /* first dump the properties (files) */
+       while ((de = readdir(d)) != NULL) {
+               /* properties are files */
+               if (de->d_type != DT_REG)
+                       continue;
+               snprintf(new_path, maxsz, "%s/%s", path, de->d_name);
+               new_path[maxsz] = '\0';
+               printf("%*s%s", depth * shift, "", de->d_name);
+
+               if (stat(new_path, &sb) != 0)
+                       die("could not open: %s\n", new_path);
+
+               fd = open(new_path, O_RDONLY);
+               if (fd == -1)
+                       die("Could not open: %s\n", new_path);
+
+               chunk = sb.st_size > buf_alloc ? buf_alloc : sb.st_size;
+               p = buf;
+               left = chunk;
+               while (left > 0) {
+                       do {
+                               ret = read(fd, p, left);
+                       } while (ret == -1 && (errno == EAGAIN || errno == EINTR));
+                       if (ret == -1)
+                               die("Read failed on: %s\n", new_path);
+                       left -= ret;
+                       p += ret;
+               }
+               close(fd);
+
+               if (chunk < sb.st_size)
+                       printf(" (trunc)");
+               utilfdt_print_data(buf, chunk);
+               printf(";\n");
+       }
+
+       /* now recurse to the directories */
+       rewinddir(d);
+       while ((de = readdir(d)) != NULL) {
+               /* properties are files */
+               if (de->d_type != DT_DIR)
+                       continue;
+               /* skip current and parent directories */
+               if (strcmp(de->d_name, ".") == 0 ||
+                               strcmp(de->d_name, "..") == 0)
+                       continue;
+               snprintf(new_path, maxsz, "%s/%s", path, de->d_name);
+               new_path[maxsz] = '\0';
+               printf("%*s%s {\n", depth * shift, "", de->d_name);
+               dump_live_internal(new_path, debug, depth + 1);
+               printf("%*s};\n", depth * shift, "");
+       }
+}
+
+static void dump_live(const char *path, bool debug)
+{
+       char *fixed_path = alloca(strlen(path) + 1);
+       char *p;
+
+       /* strip trailing / */
+       strcpy(fixed_path, path);
+       p = fixed_path + strlen(fixed_path) - 1;
+       while (*p == '/' && p > fixed_path)
+               *p-- = '\0';
+       printf("/* dump of live tree at %s */\n", fixed_path);
+       printf("/ {\n");
+       dump_live_internal(fixed_path, debug, 1);
+       printf("};\n");
+}
+
+ /* Usage related data. */
+ static const char usage_synopsis[] = "fdtdump [options] <file>";
+ static const char usage_short_opts[] = "ds" USAGE_COMMON_SHORT_OPTS;
+@@ -165,6 +262,7 @@ int main(int argc, char *argv[])
+        bool debug = false;
+        bool scan = false;
+        off_t len;
+       struct stat sb;
+ 
+        while ((opt = util_getopt_long()) != EOF) {
+                switch (opt) {
+@@ -182,6 +280,15 @@ int main(int argc, char *argv[])
+                usage("missing input filename");
+        file = argv[optind];
+ 
+       if (stat(file, &sb) != 0)
+               die("could not open: %s\n", file);
+
+       /* dump live tree if it's a directory */
+       if (S_ISDIR(sb.st_mode)) {
+               dump_live(file, debug);
+               return 0;
+       }
+
+        buf = utilfdt_read_len(file, &len);
+        if (!buf)
+                die("could not read: %s\n", file);
+-- 
+1.9.1
diff --git a/meta-ti-extras/recipes/dtc/dtc/0002-DTBO-magic-and-dtbo-format-options.patch b/meta-ti-extras/recipes/dtc/dtc/0002-DTBO-magic-and-dtbo-format-options.patch
new file mode 100644
index 0000000..73e0a09
--- /dev/null
+++ b/meta-ti-extras/recipes/dtc/dtc/0002-DTBO-magic-and-dtbo-format-options.patch
@@ -0,0 +1,253 @@
+From d69b3ebbf86c45cbe717ee35359e15af3cf02014 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+Date: Thu, 5 May 2016 14:07:48 +0300
+Subject: [PATCH] DTBO magic and dtbo format options
+Introduce a new magic number for dynamic plugin objects,
+which is enabled by selecting dtbo/input output options.
+Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+---
+ Documentation/manual.txt |  7 +++++++
+ dtc.c                    | 14 +++++++++++---
+ dtc.h                    |  4 ++--
+ fdtdump.c                |  2 +-
+ flattree.c               | 11 ++++++-----
+ libfdt/fdt.c             |  2 +-
+ libfdt/fdt.h             |  3 ++-
+ tests/mangle-layout.c    |  7 ++++---
+ 8 files changed, 34 insertions(+), 16 deletions(-)
+diff --git a/Documentation/manual.txt b/Documentation/manual.txt
+index 398de32..f64c4f4 100644
+--- a/Documentation/manual.txt
+++ b/Documentation/manual.txt
+@@ -60,6 +60,9 @@ The currently supported Input Formats are:
+     - "dtb": "blob" format.  A flattened device-tree block with
+         header in one binary blob.
+ 
+    - "dtbo" : "blob" format. Identical with "dtb" but meant
+        for use with dynamic-device tree objects.
+
+     - "dts": "source" format.  A text file containing a "source"
+         for a device-tree.
+ 
+@@ -71,6 +74,8 @@ The currently supported Output Formats are:
+ 
+      - "dtb": "blob" format
+ 
+     - "dtbo": "blob" format - for objects
+
+      - "dts": "source" format
+ 
+      - "asm": assembly language file.  A file that can be sourced
+@@ -78,6 +83,8 @@ The currently supported Output Formats are:
+         then simply be added to your Makefile.  Additionally, the
+         assembly file exports some symbols that can be used.
+ 
+     - "asmo": assembly language file for objects. Identical to "asm"
+
+ 
+ 3) Command Line
+ 
+diff --git a/dtc.c b/dtc.c
+index 5fa23c4..63c2c9c 100644
+--- a/dtc.c
+++ b/dtc.c
+@@ -117,6 +117,8 @@ static const char *guess_type_by_name(const char *fname, const char *fallback)
+                return "dts";
+        if (!strcasecmp(s, ".dtb"))
+                return "dtb";
+       if (!strcasecmp(s, ".dtbo"))
+               return "dtbo";
+        return fallback;
+ }
+ 
+@@ -147,6 +149,8 @@ static const char *guess_input_format(const char *fname, const char *fallback)
+        magic = fdt32_to_cpu(magic);
+        if (magic == FDT_MAGIC)
+                return "dtb";
+       if (magic == FDT_MAGIC_DTBO)
+               return "dtbo";
+ 
+        return guess_type_by_name(fname, fallback);
+ }
+@@ -275,7 +279,7 @@ int main(int argc, char *argv[])
+                bi = dt_from_source(arg);
+        else if (streq(inform, "fs"))
+                bi = dt_from_fs(arg);
+-       else if(streq(inform, "dtb"))
+       else if(streq(inform, "dtb") || streq(inform, "dtbo"))
+                bi = dt_from_blob(arg);
+        else
+                die("Unknown input format \"%s\"\n", inform);
+@@ -306,9 +310,13 @@ int main(int argc, char *argv[])
+        if (streq(outform, "dts")) {
+                dt_to_source(outf, bi);
+        } else if (streq(outform, "dtb")) {
+-               dt_to_blob(outf, bi, outversion);
+               dt_to_blob(outf, bi, FDT_MAGIC, outversion);
+       } else if (streq(outform, "dtbo")) {
+               dt_to_blob(outf, bi, FDT_MAGIC_DTBO, outversion);
+        } else if (streq(outform, "asm")) {
+-               dt_to_asm(outf, bi, outversion);
+               dt_to_asm(outf, bi, FDT_MAGIC, outversion);
+       } else if (streq(outform, "asmo")) {
+               dt_to_asm(outf, bi, FDT_MAGIC_DTBO, outversion);
+        } else if (streq(outform, "null")) {
+                /* do nothing */
+        } else {
+diff --git a/dtc.h b/dtc.h
+index 56212c8..9d7f2d6 100644
+--- a/dtc.h
+++ b/dtc.h
+@@ -252,8 +252,8 @@ void process_checks(bool force, struct boot_info *bi);
+ 
+ /* Flattened trees */
+ 
+-void dt_to_blob(FILE *f, struct boot_info *bi, int version);
+-void dt_to_asm(FILE *f, struct boot_info *bi, int version);
+void dt_to_blob(FILE *f, struct boot_info *bi, fdt32_t magic, int version);
+void dt_to_asm(FILE *f, struct boot_info *bi, fdt32_t magic, int version);
+ 
+ struct boot_info *dt_from_blob(const char *fname);
+ 
+diff --git a/fdtdump.c b/fdtdump.c
+index 9183555..11c2b8d 100644
+--- a/fdtdump.c
+++ b/fdtdump.c
+@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
+                        p = memchr(p, smagic[0], endp - p - 4);
+                        if (!p)
+                                break;
+-                       if (fdt_magic(p) == FDT_MAGIC) {
+                       if (fdt_magic(p) == FDT_MAGIC || fdt_magic(p) == FDT_MAGIC_DTBO) {
+                                /* try and validate the main struct */
+                                off_t this_len = endp - p;
+                                fdt32_t max_version = 17;
+diff --git a/flattree.c b/flattree.c
+index ec14954..64ed375 100644
+--- a/flattree.c
+++ b/flattree.c
+@@ -335,6 +335,7 @@ static struct data flatten_reserve_list(struct reserve_info *reservelist,
+ }
+ 
+ static void make_fdt_header(struct fdt_header *fdt,
+                           fdt32_t magic,
+                            struct version_info *vi,
+                            int reservesize, int dtsize, int strsize,
+                            int boot_cpuid_phys)
+@@ -345,7 +346,7 @@ static void make_fdt_header(struct fdt_header *fdt,
+ 
+        memset(fdt, 0xff, sizeof(*fdt));
+ 
+-       fdt->magic = cpu_to_fdt32(FDT_MAGIC);
+       fdt->magic = cpu_to_fdt32(magic);
+        fdt->version = cpu_to_fdt32(vi->version);
+        fdt->last_comp_version = cpu_to_fdt32(vi->last_comp_version);
+ 
+@@ -366,7 +367,7 @@ static void make_fdt_header(struct fdt_header *fdt,
+                fdt->size_dt_struct = cpu_to_fdt32(dtsize);
+ }
+ 
+-void dt_to_blob(FILE *f, struct boot_info *bi, int version)
+void dt_to_blob(FILE *f, struct boot_info *bi, fdt32_t magic, int version)
+ {
+        struct version_info *vi = NULL;
+        int i;
+@@ -390,7 +391,7 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version)
+        reservebuf = flatten_reserve_list(bi->reservelist, vi);
+ 
+        /* Make header */
+-       make_fdt_header(&fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,
+       make_fdt_header(&fdt, magic, vi, reservebuf.len, dtbuf.len, strbuf.len,
+                        bi->boot_cpuid_phys);
+ 
+        /*
+@@ -460,7 +461,7 @@ static void dump_stringtable_asm(FILE *f, struct data strbuf)
+        }
+ }
+ 
+-void dt_to_asm(FILE *f, struct boot_info *bi, int version)
+void dt_to_asm(FILE *f, struct boot_info *bi, fdt32_t magic, int version)
+ {
+        struct version_info *vi = NULL;
+        int i;
+@@ -832,7 +833,7 @@ struct boot_info *dt_from_blob(const char *fname)
+        }
+ 
+        magic = fdt32_to_cpu(magic);
+-       if (magic != FDT_MAGIC)
+       if (magic != FDT_MAGIC && magic != FDT_MAGIC_DTBO)
+                die("Blob has incorrect magic number\n");
+ 
+        rc = fread(&totalsize, sizeof(totalsize), 1, f);
+diff --git a/libfdt/fdt.c b/libfdt/fdt.c
+index 22286a1..28d422c 100644
+--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
+@@ -57,7 +57,7 @@
+ 
+ int fdt_check_header(const void *fdt)
+ {
+-       if (fdt_magic(fdt) == FDT_MAGIC) {
+       if (fdt_magic(fdt) == FDT_MAGIC || fdt_magic(fdt) == FDT_MAGIC_DTBO) {
+                /* Complete tree */
+                if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
+                        return -FDT_ERR_BADVERSION;
+diff --git a/libfdt/fdt.h b/libfdt/fdt.h
+index 526aedb..493cd55 100644
+--- a/libfdt/fdt.h
+++ b/libfdt/fdt.h
+@@ -55,7 +55,7 @@
+ #ifndef __ASSEMBLY__
+ 
+ struct fdt_header {
+-       fdt32_t magic;                   /* magic word FDT_MAGIC */
+       fdt32_t magic;                   /* magic word FDT_MAGIC[|_DTBO] */
+        fdt32_t totalsize;               /* total size of DT block */
+        fdt32_t off_dt_struct;           /* offset to structure */
+        fdt32_t off_dt_strings;          /* offset to strings */
+@@ -93,6 +93,7 @@ struct fdt_property {
+ #endif /* !__ASSEMBLY */
+ 
+ #define FDT_MAGIC      0xd00dfeed      /* 4: version, 4: total size */
+#define FDT_MAGIC_DTBO 0xd00dfdb0      /* DTBO magic */
+ #define FDT_TAGSIZE    sizeof(fdt32_t)
+ 
+ #define FDT_BEGIN_NODE 0x1             /* Start node: full name */
+diff --git a/tests/mangle-layout.c b/tests/mangle-layout.c
+index a76e51e..d29ebc6 100644
+--- a/tests/mangle-layout.c
+++ b/tests/mangle-layout.c
+@@ -42,7 +42,8 @@ static void expand_buf(struct bufstate *buf, int newsize)
+        buf->size = newsize;
+ }
+ 
+-static void new_header(struct bufstate *buf, int version, const void *fdt)
+static void new_header(struct bufstate *buf, fdt32_t magic, int version,
+                      const void *fdt)
+ {
+        int hdrsize;
+ 
+@@ -56,7 +57,7 @@ static void new_header(struct bufstate *buf, int version, const void *fdt)
+        expand_buf(buf, hdrsize);
+        memset(buf->buf, 0, hdrsize);
+ 
+-       fdt_set_magic(buf->buf, FDT_MAGIC);
+       fdt_set_magic(buf->buf, magic);
+        fdt_set_version(buf->buf, version);
+        fdt_set_last_comp_version(buf->buf, 16);
+        fdt_set_boot_cpuid_phys(buf->buf, fdt_boot_cpuid_phys(fdt));
+@@ -145,7 +146,7 @@ int main(int argc, char *argv[])
+        if (fdt_version(fdt) < 17)
+                CONFIG("Input tree must be v17");
+ 
+-       new_header(&buf, version, fdt);
+       new_header(&buf, FDT_MAGIC, version, fdt);
+ 
+        while (*blockorder) {
+                add_block(&buf, version, *blockorder, fdt);
+-- 
+1.9.1
diff --git a/meta-ti-extras/recipes/dtc/dtc/0003-dtc-Plugin-and-fixup-support.patch b/meta-ti-extras/recipes/dtc/dtc/0003-dtc-Plugin-and-fixup-support.patch
new file mode 100644
index 0000000..69451b8
--- /dev/null
+++ b/meta-ti-extras/recipes/dtc/dtc/0003-dtc-Plugin-and-fixup-support.patch
@@ -0,0 +1,635 @@
+From 10e5b09069bb7d5b9c4b1aced82b7b20cd06dd65 Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+Date: Tue, 21 Oct 2014 22:07:16 +0300
+Subject: [PATCH] dtc: Plugin and fixup support
+This patch enable the generation of symbols & local fixup information
+for trees compiled with the -@ (--symbols) option.
+Using this patch labels in the tree and their users emit information
+in __symbols__ and __local_fixups__ nodes.
+The __fixups__ node make possible the dynamic resolution of phandle
+references which are present in the plugin tree but lie in the
+tree that are applying the overlay against.
+Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
+---
+ Documentation/manual.txt |  16 ++++
+ checks.c                 |   8 +-
+ dtc-lexer.l              |   5 ++
+ dtc-parser.y             |  45 ++++++++--
+ dtc.c                    |  23 +++++-
+ dtc.h                    |  29 ++++++-
+ flattree.c               |   2 +-
+ fstree.c                 |   2 +-
+ livetree.c               | 209 ++++++++++++++++++++++++++++++++++++++++++++++-
+ treesource.c             |   1 +
+ 10 files changed, 327 insertions(+), 13 deletions(-)
+diff --git a/Documentation/manual.txt b/Documentation/manual.txt
+index f64c4f4..63066ec 100644
+--- a/Documentation/manual.txt
+++ b/Documentation/manual.txt
+@@ -126,6 +126,20 @@ Options:
+        Make space for <number> reserve map entries
+        Relevant for dtb and asm output only.
+ 
+    -@
+       Generates a __symbols__ node at the root node of the resulting blob
+       for any node labels used, and for any local references using phandles
+       it also generates a __local_fixups__ node that tracks them.
+
+       When using the /plugin/ tag all unresolved label references to
+       be tracked in the __fixups__ node, making dynamic resolution possible.
+
+    -A
+       Generate automatically aliases for all node labels. This is similar to
+       the -@ option (the __symbols__ node contain identical information) but
+       the semantics are slightly different since no phandles are automatically
+       generated for labeled nodes.
+
+     -S <bytes>
+        Ensure the blob at least <bytes> long, adding additional
+        space if needed.
+@@ -160,6 +174,8 @@ Here is a very rough overview of the layout of a DTS source file:
+ 
+     devicetree:   '/' nodedef
+ 
+    plugindecl:   '/' 'plugin' '/' ';'
+
+     nodedef:      '{' list_of_property list_of_subnode '}' ';'
+ 
+     property:     label PROPNAME '=' propdata ';'
+diff --git a/checks.c b/checks.c
+index 386f956..3d4c3c6 100644
+--- a/checks.c
+++ b/checks.c
+@@ -490,8 +490,12 @@ static void fixup_phandle_references(struct check *c, struct node *dt,
+ 
+                refnode = get_node_by_ref(dt, m->ref);
+                if (! refnode) {
+-                       FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+-                            m->ref);
+                       if (!(tree_get_versionflags(dt) & VF_PLUGIN))
+                               FAIL(c, "Reference to non-existent node or "
+                                               "label \"%s\"\n", m->ref);
+                       else /* mark the entry as unresolved */
+                               *((cell_t *)(prop->val.val + m->offset)) =
+                                       cpu_to_fdt32(0xffffffff);
+                        continue;
+                }
+ 
+diff --git a/dtc-lexer.l b/dtc-lexer.l
+index 790fbf6..40bbc87 100644
+--- a/dtc-lexer.l
+++ b/dtc-lexer.l
+@@ -121,6 +121,11 @@ static void lexical_error(const char *fmt, ...);
+                        return DT_V1;
+                }
+ 
+<*>"/plugin/"  {
+                       DPRINT("Keyword: /plugin/\n");
+                       return DT_PLUGIN;
+               }
+
+ <*>"/memreserve/"      {
+                        DPRINT("Keyword: /memreserve/\n");
+                        BEGIN_DEFAULT();
+diff --git a/dtc-parser.y b/dtc-parser.y
+index 000873f..2890c1c 100644
+--- a/dtc-parser.y
+++ b/dtc-parser.y
+@@ -19,6 +19,7 @@
+  */
+ %{
+ #include <stdio.h>
+#include <inttypes.h>
+ 
+ #include "dtc.h"
+ #include "srcpos.h"
+@@ -33,6 +34,7 @@ extern void yyerror(char const *s);
+ 
+ extern struct boot_info *the_boot_info;
+ extern bool treesource_error;
+extern unsigned int the_versionflags;
+ %}
+ 
+ %union {
+@@ -52,9 +54,11 @@ extern bool treesource_error;
+        struct node *nodelist;
+        struct reserve_info *re;
+        uint64_t integer;
+       unsigned int flags;
+ }
+ 
+ %token DT_V1
+%token DT_PLUGIN
+ %token DT_MEMRESERVE
+ %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR
+ %token DT_BITS
+@@ -71,6 +75,8 @@ extern bool treesource_error;
+ 
+ %type <data> propdata
+ %type <data> propdataprefix
+%type <flags> versioninfo
+%type <flags> plugindecl
+ %type <re> memreserve
+ %type <re> memreserves
+ %type <array> arrayprefix
+@@ -101,13 +107,33 @@ extern bool treesource_error;
+ %%
+ 
+ sourcefile:
+-         DT_V1 ';' memreserves devicetree
+         versioninfo ';' memreserves devicetree
+                {
+-                       the_boot_info = build_boot_info($3, $4,
+                       the_boot_info = build_boot_info($1, $3, $4,
+                                                        guess_boot_cpuid($4));
+                }
+        ;
+ 
+versioninfo:
+       DT_V1 plugindecl
+               {
+                       the_versionflags |= VF_DT_V1 | $2;
+                       $$ = the_versionflags;
+               }
+       ;
+
+plugindecl:
+       DT_PLUGIN
+               {
+                       the_versionflags |= VF_PLUGIN;
+                       $$ = VF_PLUGIN;
+               }
+       | /* empty */
+               {
+                       $$ = 0;
+               }
+       ;
+
+ memreserves:
+          /* empty */
+                {
+@@ -156,10 +182,14 @@ devicetree:
+                {
+                        struct node *target = get_node_by_ref($1, $2);
+ 
+-                       if (target)
+                       if (target) {
+                                merge_nodes(target, $3);
+-                       else
+-                               ERROR(&@2, "Label or path %s not found", $2);
+                       } else {
+                               if (the_versionflags & VF_PLUGIN)
+                                       add_orphan_node($1, $3, $2);
+                               else
+                                       ERROR(&@2, "Label or path %s not found", $2);
+                       }
+                        $$ = $1;
+                }
+        | devicetree DT_DEL_NODE DT_REF ';'
+@@ -174,6 +204,11 @@ devicetree:
+ 
+                        $$ = $1;
+                }
+       | /* empty */
+               {
+                       /* build empty node */
+                       $$ = name_node(build_node(NULL, NULL), "");
+               }
+        ;
+ 
+ nodedef:
+diff --git a/dtc.c b/dtc.c
+index 63c2c9c..a25f852 100644
+--- a/dtc.c
+++ b/dtc.c
+@@ -31,6 +31,8 @@ int reservenum;               /* Number of memory reservation slots */
+ int minsize;           /* Minimum blob size */
+ int padsize;           /* Additional padding to blob */
+ int phandle_format = PHANDLE_BOTH;     /* Use linux,phandle or phandle properties */
+int symbol_fixup_support;
+int auto_label_aliases;
+ 
+ static void fill_fullpaths(struct node *tree, const char *prefix)
+ {
+@@ -53,7 +55,7 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
+ #define FDT_VERSION(version)   _FDT_VERSION(version)
+ #define _FDT_VERSION(version)  #version
+ static const char usage_synopsis[] = "dtc [options] <input file>";
+-static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:hv";
+static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:@Ahv";
+ static struct option const usage_long_opts[] = {
+        {"quiet",            no_argument, NULL, 'q'},
+        {"in-format",         a_argument, NULL, 'I'},
+@@ -71,6 +73,8 @@ static struct option const usage_long_opts[] = {
+        {"phandle",           a_argument, NULL, 'H'},
+        {"warning",           a_argument, NULL, 'W'},
+        {"error",             a_argument, NULL, 'E'},
+       {"symbols",          no_argument, NULL, '@'},
+       {"auto-alias",       no_argument, NULL, 'A'},
+        {"help",             no_argument, NULL, 'h'},
+        {"version",          no_argument, NULL, 'v'},
+        {NULL,               no_argument, NULL, 0x0},
+@@ -101,6 +105,8 @@ static const char * const usage_opts_help[] = {
+         "\t\tboth   - Both \"linux,phandle\" and \"phandle\" properties",
+        "\n\tEnable/disable warnings (prefix with \"no-\")",
+        "\n\tEnable/disable errors (prefix with \"no-\")",
+       "\n\tEnable symbols/fixup support",
+       "\n\tEnable auto-alias of labels",
+        "\n\tPrint this help and exit",
+        "\n\tPrint version and exit",
+        NULL,
+@@ -237,7 +243,12 @@ int main(int argc, char *argv[])
+                case 'E':
+                        parse_checks_option(false, true, optarg);
+                        break;
+-
+               case '@':
+                       symbol_fixup_support = 1;
+                       break;
+               case 'A':
+                       auto_label_aliases = 1;
+                       break;
+                case 'h':
+                        usage(NULL);
+                default:
+@@ -295,6 +306,14 @@ int main(int argc, char *argv[])
+        fill_fullpaths(bi->dt, "");
+        process_checks(force, bi);
+ 
+       if (auto_label_aliases)
+               generate_label_tree(bi->dt, "aliases", false);
+
+       if (symbol_fixup_support) {
+               generate_label_tree(bi->dt, "__symbols__", true);
+               generate_fixups_tree(bi->dt);
+       }
+
+        if (sort)
+                sort_tree(bi);
+ 
+diff --git a/dtc.h b/dtc.h
+index 9d7f2d6..392cde7 100644
+--- a/dtc.h
+++ b/dtc.h
+@@ -54,6 +54,12 @@ extern int reservenum;               /* Number of memory reservation slots */
+ extern int minsize;            /* Minimum blob size */
+ extern int padsize;            /* Additional padding to blob */
+ extern int phandle_format;     /* Use linux,phandle or phandle properties */
+extern int symbol_fixup_support;/* enable symbols & fixup support */
+extern int auto_label_aliases; /* auto generate labels -> aliases */
+
+/*
+ * Tree source globals
+ */
+ 
+ #define PHANDLE_LEGACY 0x1
+ #define PHANDLE_EPAPR  0x2
+@@ -158,6 +164,9 @@ struct node {
+        int addr_cells, size_cells;
+ 
+        struct label *labels;
+
+       /* only for the root (parent == NULL) */
+       struct boot_info *bi;
+ };
+ 
+ #define for_each_label_withdel(l0, l) \
+@@ -194,6 +203,7 @@ struct node *build_node_delete(void);
+ struct node *name_node(struct node *node, char *name);
+ struct node *chain_node(struct node *first, struct node *list);
+ struct node *merge_nodes(struct node *old_node, struct node *new_node);
+void add_orphan_node(struct node *old_node, struct node *new_node, char *ref);
+ 
+ void add_property(struct node *node, struct property *prop);
+ void delete_property_by_name(struct node *node, char *name);
+@@ -201,6 +211,8 @@ void delete_property(struct property *prop);
+ void add_child(struct node *parent, struct node *child);
+ void delete_node_by_name(struct node *parent, char *name);
+ void delete_node(struct node *node);
+struct property *append_to_property(struct node *node,
+                                   char *name, const void *data, int len);
+ 
+ const char *get_unitname(struct node *node);
+ struct property *get_property(struct node *node, const char *propname);
+@@ -236,14 +248,29 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,
+ 
+ 
+ struct boot_info {
+       unsigned int versionflags;
+        struct reserve_info *reservelist;
+        struct node *dt;                /* the device tree */
+        uint32_t boot_cpuid_phys;
+ };
+ 
+-struct boot_info *build_boot_info(struct reserve_info *reservelist,
+/* version flags definitions */
+#define VF_DT_V1       0x0001  /* /dts-v1/ */
+#define VF_PLUGIN      0x0002  /* /plugin/ */
+
+static inline unsigned int tree_get_versionflags(struct node *dt)
+{
+       if (!dt || !dt->bi)
+               return 0;
+       return dt->bi->versionflags;
+}
+
+struct boot_info *build_boot_info(unsigned int versionflags,
+                                 struct reserve_info *reservelist,
+                                  struct node *tree, uint32_t boot_cpuid_phys);
+ void sort_tree(struct boot_info *bi);
+void generate_label_tree(struct node *dt, char *gen_node_name, bool allocph);
+void generate_fixups_tree(struct node *dt);
+ 
+ /* Checks */
+ 
+diff --git a/flattree.c b/flattree.c
+index 64ed375..4fe64d4 100644
+--- a/flattree.c
+++ b/flattree.c
+@@ -930,5 +930,5 @@ struct boot_info *dt_from_blob(const char *fname)
+ 
+        fclose(f);
+ 
+-       return build_boot_info(reservelist, tree, boot_cpuid_phys);
+       return build_boot_info(VF_DT_V1, reservelist, tree, boot_cpuid_phys);
+ }
+diff --git a/fstree.c b/fstree.c
+index 6d1beec..54f520b 100644
+--- a/fstree.c
+++ b/fstree.c
+@@ -86,6 +86,6 @@ struct boot_info *dt_from_fs(const char *dirname)
+        tree = read_fstree(dirname);
+        tree = name_node(tree, "");
+ 
+-       return build_boot_info(NULL, tree, guess_boot_cpuid(tree));
+       return build_boot_info(VF_DT_V1, NULL, tree, guess_boot_cpuid(tree));
+ }
+ 
+diff --git a/livetree.c b/livetree.c
+index e229b84..3eab9e2 100644
+--- a/livetree.c
+++ b/livetree.c
+@@ -216,6 +216,31 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
+        return old_node;
+ }
+ 
+void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
+{
+       static unsigned int next_orphan_fragment = 0;
+       struct node *node = xmalloc(sizeof(*node));
+       struct property *p;
+       struct data d = empty_data;
+       char *name;
+
+       memset(node, 0, sizeof(*node));
+
+       d = data_add_marker(d, REF_PHANDLE, ref);
+       d = data_append_integer(d, 0xffffffff, 32);
+
+       p = build_property("target", d);
+       add_property(node, p);
+
+       xasprintf(&name, "fragment@%u",
+                       next_orphan_fragment++);
+       name_node(node, name);
+       name_node(new_node, "__overlay__");
+
+       add_child(dt, node);
+       add_child(node, new_node);
+}
+
+ struct node *chain_node(struct node *first, struct node *list)
+ {
+        assert(first->next_sibling == NULL);
+@@ -296,6 +321,24 @@ void delete_node(struct node *node)
+        delete_labels(&node->labels);
+ }
+ 
+struct property *append_to_property(struct node *node,
+                                   char *name, const void *data, int len)
+{
+       struct data d;
+       struct property *p;
+
+       p = get_property(node, name);
+       if (p) {
+               d = data_append_data(p->val, data, len);
+               p->val = d;
+       } else {
+               d = data_append_data(empty_data, data, len);
+               p = build_property(name, d);
+               add_property(node, p);
+       }
+       return p;
+}
+
+ struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size)
+ {
+        struct reserve_info *new = xmalloc(sizeof(*new));
+@@ -335,15 +378,19 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,
+        return list;
+ }
+ 
+-struct boot_info *build_boot_info(struct reserve_info *reservelist,
+struct boot_info *build_boot_info(unsigned int versionflags,
+                                 struct reserve_info *reservelist,
+                                  struct node *tree, uint32_t boot_cpuid_phys)
+ {
+        struct boot_info *bi;
+ 
+        bi = xmalloc(sizeof(*bi));
+       bi->versionflags = versionflags;
+        bi->reservelist = reservelist;
+        bi->dt = tree;
+        bi->boot_cpuid_phys = boot_cpuid_phys;
+       /* link back */
+       tree->bi = bi;
+ 
+        return bi;
+ }
+@@ -709,3 +756,163 @@ void sort_tree(struct boot_info *bi)
+        sort_reserve_entries(bi);
+        sort_node(bi->dt);
+ }
+
+/* utility helper to avoid code duplication */
+static struct node *build_and_name_child_node(struct node *parent, char *name)
+{
+       struct node *node;
+
+       node = build_node(NULL, NULL);
+       name_node(node, xstrdup(name));
+       add_child(parent, node);
+
+       return node;
+}
+
+static void generate_label_tree_internal(struct node *dt, struct node *node,
+                                        struct node *an, bool allocph)
+{
+       struct node *c;
+       struct property *p;
+       struct label *l;
+
+       /* if if there are labels */
+       if (node->labels) {
+               /* now add the label in the node */
+               for_each_label(node->labels, l) {
+                       /* check whether the label already exists */
+                       p = get_property(an, l->label);
+                       if (p) {
+                               fprintf(stderr, "WARNING: label %s already"
+                                       " exists in /%s", l->label,
+                                       an->name);
+                               continue;
+                       }
+
+                       /* insert it */
+                       p = build_property(l->label,
+                               data_copy_escape_string(node->fullpath,
+                                               strlen(node->fullpath)));
+                       add_property(an, p);
+               }
+
+               /* force allocation of a phandle for this node */
+               if (allocph)
+                       (void)get_node_phandle(dt, node);
+       }
+
+       for_each_child(node, c)
+               generate_label_tree_internal(dt, c, an, allocph);
+}
+
+void generate_label_tree(struct node *dt, char *gen_node_name, bool allocph)
+{
+       struct node *an;
+
+       an = build_and_name_child_node(dt, gen_node_name);
+       if (!an)
+               die("Could not build label node /%s\n", gen_node_name);
+
+       generate_label_tree_internal(dt, dt, an, allocph);
+}
+
+static char *fixups_name = "__fixups__";
+static char *local_fixups_name = "__local_fixups__";
+
+static void add_fixup_entry(struct node *dt, struct node *node,
+               struct property *prop, struct marker *m)
+{
+       struct node *fn;        /* fixup node */
+       char *entry;
+
+       /* m->ref can only be a REF_PHANDLE, but check anyway */
+       assert(m->type == REF_PHANDLE);
+
+       /* fn is the node we're putting entries in */
+       fn = get_subnode(dt, fixups_name);
+       assert(fn != NULL);
+
+       /* there shouldn't be any ':' in the arguments */
+       if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
+               die("arguments should not contain ':'\n");
+
+       xasprintf(&entry, "%s:%s:%u",
+                       node->fullpath, prop->name, m->offset);
+       append_to_property(fn, m->ref, entry, strlen(entry) + 1);
+}
+
+static void add_local_fixup_entry(struct node *dt, struct node *node,
+               struct property *prop, struct marker *m,
+               struct node *refnode)
+{
+       struct node *lfn, *wn, *nwn;    /* local fixup node, walk node, new */
+       uint32_t value_32;
+       char *s, *e, *comp;
+       int len;
+
+       /* fn is the node we're putting entries in */
+       lfn = get_subnode(dt, local_fixups_name);
+       assert(lfn != NULL);
+
+       /* walk the path components creating nodes if they don't exist */
+       comp = xmalloc(strlen(node->fullpath) + 1);
+       /* start skipping the first / */
+       s = node->fullpath + 1;
+       wn = lfn;
+       while (*s) {
+               /* retrieve path component */
+               e = strchr(s, '/');
+               if (e == NULL)
+                       e = s + strlen(s);
+               len = e - s;
+               memcpy(comp, s, len);
+               comp[len] = '\0';
+
+               /* if no node exists, create it */
+               nwn = get_subnode(wn, comp);
+               if (!nwn)
+                       nwn = build_and_name_child_node(wn, comp);
+               wn = nwn;
+
+               /* last path component */
+               if (!*e)
+                       break;
+
+               /* next path component */
+               s = e + 1;
+       }
+       free(comp);
+
+       value_32 = cpu_to_fdt32(m->offset);
+       append_to_property(wn, prop->name, &value_32, sizeof(value_32));
+}
+
+static void generate_fixups_tree_internal(struct node *dt, struct node *node)
+{
+       struct node *c;
+       struct property *prop;
+       struct marker *m;
+       struct node *refnode;
+
+       for_each_property(node, prop) {
+               m = prop->val.markers;
+               for_each_marker_of_type(m, REF_PHANDLE) {
+                       refnode = get_node_by_ref(dt, m->ref);
+                       if (!refnode)
+                               add_fixup_entry(dt, node, prop, m);
+                       else
+                               add_local_fixup_entry(dt, node, prop, m,
+                                               refnode);
+               }
+       }
+
+       for_each_child(node, c)
+               generate_fixups_tree_internal(dt, c);
+}
+
+void generate_fixups_tree(struct node *dt)
+{
+       build_and_name_child_node(dt, fixups_name);
+       build_and_name_child_node(dt, local_fixups_name);
+       generate_fixups_tree_internal(dt, dt);
+}
+diff --git a/treesource.c b/treesource.c
+index a55d1d1..2539a57 100644
+--- a/treesource.c
+++ b/treesource.c
+@@ -27,6 +27,7 @@ extern YYLTYPE yylloc;
+ 
+ struct boot_info *the_boot_info;
+ bool treesource_error;
+unsigned int the_versionflags;
+ 
+ struct boot_info *dt_from_source(const char *fname)
+ {
+-- 
+1.9.1
diff --git a/meta-ti-extras/recipes/dtc/dtc/0004-plugin-Transparently-support-old-style-syntax.patch b/meta-ti-extras/recipes/dtc/dtc/0004-plugin-Transparently-support-old-style-syntax.patch
new file mode 100644
index 0000000..ad4eb5b
--- /dev/null
+++ b/meta-ti-extras/recipes/dtc/dtc/0004-plugin-Transparently-support-old-style-syntax.patch
@@ -0,0 +1,61 @@
+From f7da040f2bed614fd55a4901d71fafb916863e8a Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+Date: Wed, 20 Apr 2016 20:36:35 +0300
+Subject: [PATCH] plugin: Transparently support old style syntax
+The old style syntax for plugins is still out in the wild.
+This patch transparently support it.
+Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+---
+ dtc-parser.y | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+diff --git a/dtc-parser.y b/dtc-parser.y
+index 2890c1c..4a67baf 100644
+--- a/dtc-parser.y
+++ b/dtc-parser.y
+@@ -77,6 +77,7 @@ extern unsigned int the_versionflags;
+ %type <data> propdataprefix
+ %type <flags> versioninfo
+ %type <flags> plugindecl
+%type <flags> oldplugindecl
+ %type <re> memreserve
+ %type <re> memreserves
+ %type <array> arrayprefix
+@@ -107,10 +108,10 @@ extern unsigned int the_versionflags;
+ %%
+ 
+ sourcefile:
+-         versioninfo ';' memreserves devicetree
+         versioninfo ';' oldplugindecl memreserves devicetree
+                {
+-                       the_boot_info = build_boot_info($1, $3, $4,
+-                                                       guess_boot_cpuid($4));
+                       the_boot_info = build_boot_info($1 | $3, $4, $5,
+                                                       guess_boot_cpuid($5));
+                }
+        ;
+ 
+@@ -134,6 +135,18 @@ plugindecl:
+                }
+        ;
+ 
+oldplugindecl:
+       DT_PLUGIN ';'
+               {
+                       the_versionflags |= VF_PLUGIN;
+                       $$ = VF_PLUGIN;
+               }
+       | /* empty */
+               {
+                       $$ = 0;
+               }
+       ;
+
+ memreserves:
+          /* empty */
+                {
+-- 
+1.9.1
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend b/meta-ti-extras/recipes/dtc/dtc_git.bbappend
index f346a6b..e4f43eb 100644
--- a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend
+++ b/meta-ti-extras/recipes/dtc/dtc_git.bbappend
@@ -29,12 +29,11 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " file://libdrm.pc"
+SRCREV = "d71d25d76012896521f937bf0c69f27b1a37cdc2"
-SRC_URI_remove_nvidia-logan = "file://${PLATFORM_TOPDIR}/include/drm_fourcc.h"
-do_install_append() {
+SRC_URI += " \
-    install -d ${D}/usr/lib/pkgconfig
+    file://0001-fdtdump-Add-live-tree-dump-capability.patch \
-    install -m 0776 ${WORKDIR}/libdrm.pc ${D}/usr/lib/pkgconfig/libdrm.pc
+    file://0002-DTBO-magic-and-dtbo-format-options.patch \
-}
+    file://0003-dtc-Plugin-and-fixup-support.patch \
+    file://0004-plugin-Transparently-support-old-style-syntax.patch \
-PACKAGES += "${PN}-dev"
+    "
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.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
deleted file mode 100644
index fe484f5..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
+++ /dev/null
@@ -1,60 +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  \
-           file://99-fb.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
-}
-do_install_append() {
-    install -m 0644 ${WORKDIR}/99-fb.rules ${D}${sysconfdir}/udev/rules.d/
-}
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/99-fb.rules
index ca5ebc8..ca5ebc8 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/99-fb.rules
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
index a9c3c0d..15fe3ce 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
@@ -28,6 +28,11 @@
 ############################################################################
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
+SRC_URI += "file://99-fb.rules"
-        file://0001-am335x-evm-disable-console-cursor-blinking.patch \
-        "
+do_install_append() {
+    install -d ${D}${base_libdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-fb.rules ${D}${base_libdir}/udev/rules.d
+}
+FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging/beaglebone/defconfig b/meta-ti-extras/recipes/linux/linux-ti-staging/beaglebone/defconfig
new file mode 100644
index 0000000..5d30001
--- /dev/null
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging/beaglebone/defconfig
@@ -0,0 +1,6301 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 4.4.19 Kernel Configuration
+#
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_MIGHT_HAVE_PCI=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+#
+# General setup
+#
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_LZO=y
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FHANDLE=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+#
+# RCU Subsystem
+#
+CONFIG_TINY_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+# CONFIG_TASKS_RCU is not set
+# CONFIG_RCU_STALL_COMMON is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_USERFAULTFD is not set
+CONFIG_MEMBARRIER=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_KEXEC_CORE=y
+CONFIG_OPROFILE=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_FREEZER=y
+#
+# System Type
+#
+CONFIG_MMU=y
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP1 is not set
+#
+# Multiple platform selection
+#
+#
+# CPU Core family selection
+#
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
+# CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MEDIATEK is not set
+CONFIG_ARCH_OMAP=y
+#
+# TI OMAP Common Features
+#
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_MUX=y
+CONFIG_OMAP_MUX_DEBUG=y
+CONFIG_OMAP_MUX_WARNINGS=y
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_PM_NOOP=y
+CONFIG_MACH_OMAP_GENERIC=y
+#
+# TI OMAP/AM/DM/DRA Family
+#
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_SOC_OMAP5 is not set
+CONFIG_SOC_AM33XX=y
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_DRA7XX is not set
+CONFIG_ARCH_OMAP2PLUS=y
+#
+# TI OMAP2/3/4 Specific Features
+#
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_SOC_HAS_OMAP2_SDRC=y
+#
+# OMAP Legacy Platform Data Board Type
+#
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_ZX is not set
+# CONFIG_ARCH_ZYNQ is not set
+#
+# Processor Type
+#
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
+CONFIG_VDSO=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+# CONFIG_PL310_ERRATA_753970 is not set
+# CONFIG_PL310_ERRATA_769419 is not set
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_HEAVY_MB=y
+# CONFIG_ARM_KERNMEM_PERMS is not set
+CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_775420=y
+# CONFIG_ARM_ERRATA_773022 is not set
+#
+# Bus support
+#
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS_GENERIC is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_PCCARD is not set
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+# CONFIG_SMP is not set
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_ARM_PSCI=y
+CONFIG_ARCH_NR_GPIO=0
+CONFIG_HAVE_PREEMPT_LAZY=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+# CONFIG_PREEMPT_RT_FULL is not set
+CONFIG_HZ_FIXED=0
+CONFIG_HZ_100=y
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+CONFIG_THUMB2_KERNEL=y
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
+CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_AEABI=y
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_NO_BOOTMEM=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_CLEANCACHE is not set
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_ZSMALLOC=m
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_SECCOMP=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_XEN is not set
+#
+# Boot options
+#
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE=""
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
+#
+# CPU Power Management
+#
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=y
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
+#
+# CPU Idle
+#
+# CONFIG_CPU_IDLE is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+#
+# Floating point emulation
+#
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_OPP=y
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_CPU_PM=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=m
+# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NETFILTER_XTABLES=m
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+# CONFIG_NET_CLS_FLOWER is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+# CONFIG_VSOCKETS is not set
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_HSR=m
+# CONFIG_NET_SWITCHDEV is not set
+# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NET_TCPPROBE is not set
+CONFIG_NET_DROP_MONITOR=m
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_LEDS is not set
+# CONFIG_CAN_TI_HECC is not set
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_GRCAN is not set
+# CONFIG_CAN_RCAR is not set
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_CC770 is not set
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_MCP251X=m
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_SOFTING=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+# CONFIG_BT_HCIUART_INTEL is not set
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_REGULATOR is not set
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+# CONFIG_NFC_FDP is not set
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+# CONFIG_NFC_MRVL_USB is not set
+# CONFIG_NFC_ST21NFCA is not set
+# CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_NXP_NCI is not set
+# CONFIG_NFC_S3FWRN5_I2C is not set
+CONFIG_LWTUNNEL=y
+CONFIG_HAVE_BPF_JIT=y
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.elf am335x-bone-scale-data.bin am335x-evm-scale-data.bin am43x-evm-scale-data.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_FENCE_TRACE is not set
+CONFIG_DMA_CMA=y
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=24
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+#
+# Bus devices
+#
+# CONFIG_ARM_CCI400_PMU is not set
+# CONFIG_ARM_CCI500_PMU is not set
+# CONFIG_ARM_CCN is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
+CONFIG_OMAP_INTERCONNECT=y
+CONFIG_OMAP_OCP2SCP=y
+CONFIG_VEXPRESS_CONFIG=y
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PLATRAM=m
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_BCH=y
+CONFIG_MTD_NAND_ECC_BCH=y
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_OMAP2=m
+# CONFIG_MTD_NAND_OMAP_BCH is not set
+# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_HISI504 is not set
+CONFIG_MTD_ONENAND=y
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_LPDDR2_NVM is not set
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_MTD=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_OF_CONFIGFS=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_LZ4_COMPRESS=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+# CONFIG_MG_DISK is not set
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+CONFIG_HWLAT_DETECTOR=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_TI_DAC7512=m
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_VEXPRESS_SYSCFG=y
+CONFIG_BONE_CAPEMGR=y
+# CONFIG_DEV_OVERLAYMGR is not set
+CONFIG_TIEQEP=m
+CONFIG_C2PORT=m
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_SPI=m
+CONFIG_SENSORS_LIS3_I2C=m
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+#
+# Intel MIC Bus Driver
+#
+#
+# SCIF Bus Driver
+#
+#
+# Intel MIC Host Driver
+#
+#
+# Intel MIC Card Driver
+#
+#
+# SCIF Driver
+#
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+#
+# Argus cape driver for beaglebone black
+#
+CONFIG_CAPE_BONE_ARGUS=y
+CONFIG_BEAGLEBONE_PINMUX_HELPER=y
+# CONFIG_ECHO is not set
+# CONFIG_CXL_BASE is not set
+# CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_EEH is not set
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_PROC_FS=y
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI_PLATFORM=y
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_QORIQ=y
+CONFIG_ATA_SFF=y
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_ATA_BMDMA=y
+#
+# SATA SFF controllers with BMDMA
+#
+#
+# PATA SFF controllers with BMDMA
+#
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_OF_PLATFORM=y
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_MQ_DEFAULT is not set
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+# CONFIG_ATM_TCP is not set
+#
+# CAIF transport drivers
+#
+# CONFIG_VHOST_NET is not set
+# CONFIG_VHOST_SCSI is not set
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+CONFIG_ETHERNET=y
+# CONFIG_ALTERA_TSE is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+# CONFIG_SYSTEMPORT is not set
+CONFIG_NET_VENDOR_CIRRUS=y
+# CONFIG_CS89x0 is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FARADAY=y
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_HISILICON=y
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HIP04_ETH is not set
+# CONFIG_HNS is not set
+# CONFIG_HNS_DSAF is not set
+# CONFIG_HNS_ENET is not set
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MVMDIO is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+CONFIG_KS8851=m
+# CONFIG_KS8851_MLL is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AX88796 is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000 is not set
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_SMC911X=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_NET_VENDOR_STMICRO=y
+# CONFIG_STMMAC_ETH is not set
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_DAVINCI_MDIO=y
+CONFIG_TI_DAVINCI_CPDMA=y
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW_ALE=y
+CONFIG_TI_CPSW=y
+CONFIG_TI_CPTS=y
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_PHYLIB=y
+#
+# MII PHY device drivers
+#
+# CONFIG_AQUANTIA_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_TERANETICS_PHY is not set
+CONFIG_SMSC_PHY=y
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_DP83848_PHY=y
+CONFIG_DP83867_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_FIXED_PHY=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_WLAN=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AT76C50X_USB=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_MAC80211_HWSIM=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_ATH10K=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+# CONFIG_CW1200 is not set
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+# CONFIG_ISDN is not set
+CONFIG_NVM=y
+# CONFIG_NVM_DEBUG is not set
+# CONFIG_NVM_GENNVM is not set
+# CONFIG_NVM_RRPC is not set
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_TWL4030=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CAP11XX=m
+CONFIG_KEYBOARD_BCM=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+CONFIG_TOUCHSCREEN_FT6236=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=y
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_RM_TS is not set
+# CONFIG_TOUCHSCREEN_SILEAD is not set
+# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_SUR40 is not set
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_GP2A=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_KXTJ9_POLLED_MODE=y
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=y
+CONFIG_INPUT_AXP20X_PEK=y
+CONFIG_INPUT_TWL4030_PWRBUTTON=y
+CONFIG_INPUT_TWL4030_VIBRA=y
+CONFIG_INPUT_TWL6040_VIBRA=y
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=y
+CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_PWM_BEEPER is not set
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+# CONFIG_INPUT_DA9063_ONKEY is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+CONFIG_INPUT_DRV260X_HAPTICS=m
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+CONFIG_INPUT_DRV2667_HAPTICS=m
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_USERIO is not set
+CONFIG_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_N_GSM=m
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_DMA is not set
+CONFIG_SERIAL_8250_NR_UARTS=6
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_OMAP=y
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_OF_PLATFORM=y
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+# CONFIG_SERIAL_KGDB_NMI is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+# CONFIG_SERIAL_OMAP is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_STM32 is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
+# CONFIG_TTY_PRINTK is not set
+CONFIG_HVC_DRIVER=y
+# CONFIG_HVC_DCC is not set
+CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_TIS_ST33ZP24 is not set
+# CONFIG_XILLYBUS is not set
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_MUX_PINCTRL=y
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCA=m
+#
+# I2C Hardware Bus support
+#
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=y
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OMAP=y
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_RK3X=y
+CONFIG_I2C_SIMTEC=m
+# CONFIG_I2C_XILINX is not set
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_GPIO=m
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
+CONFIG_SPI_TI_QSPI=m
+# CONFIG_SPI_PXA2XX_PCI is not set
+CONFIG_SPI_ROCKCHIP=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+# CONFIG_SPI_DESIGNWARE is not set
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+#
+# HSI controllers
+#
+#
+# HSI clients
+#
+# CONFIG_HSI_CHAR is not set
+#
+# PPS support
+#
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+# CONFIG_NTP_PPS is not set
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_GPIO=m
+#
+# PPS generators support
+#
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PINCTRL=y
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_TI_IODELAY=y
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_OF_HELPER=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_MAX730X=m
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EM is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_OMAP=y
+CONFIG_GPIO_SYSCON=y
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_ZX is not set
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_ADNP=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_SX150X=y
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_DA9052=y
+CONFIG_GPIO_DA9055=y
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=y
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_74X164=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+#
+# SPI or I2C GPIO expanders
+#
+CONFIG_GPIO_MCP23S08=m
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+CONFIG_W1=y
+CONFIG_W1_CON=y
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_HDQ_MASTER_OMAP=m
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=y
+CONFIG_BATTERY_BQ27XXX_PLATFORM=y
+CONFIG_BATTERY_DA9052=m
+CONFIG_AXP288_FUEL_GAUGE=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_TWL4030_MADC is not set
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHARGER_LP8727 is not set
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_BQ2415X=m
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_SMB347 is not set
+CONFIG_CHARGER_TPS65217=m
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+CONFIG_AXP20X_POWER=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+#
+# Native drivers
+#
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=y
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TWL4030_MADC=m
+# CONFIG_SENSORS_VEXPRESS is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_IMX_THERMAL is not set
+#
+# Texas Instruments thermal drivers
+#
+CONFIG_TI_SOC_THERMAL=y
+CONFIG_TI_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_DA9052_WATCHDOG is not set
+# CONFIG_DA9055_WATCHDOG is not set
+# CONFIG_DA9063_WATCHDOG is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_TWL4030_WATCHDOG=y
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_BCM7038_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_HOST_SOC is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+# CONFIG_BCMA_HOST_SOC is not set
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_AS3711 is not set
+CONFIG_MFD_AS3722=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_AXP20X=y
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+# CONFIG_MFD_DA9062 is not set
+CONFIG_MFD_DA9063=y
+# CONFIG_MFD_DA9150 is not set
+CONFIG_MFD_DLN2=y
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_INTEL_SOC_PMIC is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_RT5033 is not set
+CONFIG_MFD_RTSX_USB=m
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+CONFIG_MFD_OMAP_USB_HOST=y
+CONFIG_MFD_PALMAS=y
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65090 is not set
+CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65218=y
+# CONFIG_MFD_TPS6586X is not set
+CONFIG_MFD_TPS65910=y
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_VEXPRESS_SYSREG=y
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_ACT8865=m
+# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_AS3722=y
+CONFIG_REGULATOR_AXP20X=y
+CONFIG_REGULATOR_DA9052=y
+# CONFIG_REGULATOR_DA9055 is not set
+CONFIG_REGULATOR_DA9063=y
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=y
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=y
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=y
+CONFIG_REGULATOR_PFUZE100=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_TI_ABB=y
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+CONFIG_REGULATOR_TPS65023=y
+CONFIG_REGULATOR_TPS6507X=y
+CONFIG_REGULATOR_TPS65217=y
+CONFIG_REGULATOR_TPS65218=y
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_TPS65910=y
+CONFIG_REGULATOR_TWL4030=y
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_MEDIA_SUPPORT=y
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_DVB_CORE=y
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+#
+# Media drivers
+#
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_TM6000 is not set
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+# CONFIG_DVB_USB_RTL28XXU is not set
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+# CONFIG_VIDEO_XILINX is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_VIDEO_SH_VEU is not set
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VIM2M is not set
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_DVB_C8SECTPFE=m
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+# CONFIG_PLATFORM_SI4713 is not set
+CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=y
+#
+# Encoders, decoders, sensors and other helper chips
+#
+#
+# Audio decoders, processors and mixers
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_UDA1342 is not set
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+# CONFIG_VIDEO_SONY_BTF_MPX is not set
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_ADV7604 is not set
+# CONFIG_VIDEO_ADV7842 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_TW2804 is not set
+# CONFIG_VIDEO_TW9903 is not set
+# CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_AD9389B is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+#
+# Camera sensor devices
+#
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV7640 is not set
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_AS3645A is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+#
+# Audio/Video compression chips
+#
+# CONFIG_VIDEO_SAA6752HS is not set
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+#
+# Sensors used on soc_camera driver
+#
+#
+# soc_camera sensor drivers
+#
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_MEDIA_TUNER=y
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+#
+# Customise DVB Frontends
+#
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+# CONFIG_DVB_M88DS3103 is not set
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_HD29L2=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+# CONFIG_DVB_RTL2830 is not set
+# CONFIG_DVB_RTL2832 is not set
+# CONFIG_DVB_RTL2832_SDR is not set
+# CONFIG_DVB_SI2168 is not set
+CONFIG_DVB_AS102_FE=m
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+#
+# Graphics support
+#
+CONFIG_DRM=y
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADIHDMI=m
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_UDL=m
+# CONFIG_DRM_ARMADA is not set
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
+CONFIG_DRM_VIRTIO_GPU=m
+# CONFIG_DRM_FSL_DCU is not set
+CONFIG_DRM_BRIDGE=y
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_STI is not set
+#
+# Frame buffer Devices
+#
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_CMDLINE=y
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_SIMPLE=y
+# CONFIG_OMAP2_DSS is not set
+CONFIG_FB_SSD1307=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_DA9052 is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+CONFIG_BACKLIGHT_GPIO=m
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+#
+# HD-Audio
+#
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_ARM=y
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_EDMA_SOC=m
+CONFIG_SND_DAVINCI_SOC_MCASP=m
+CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
+CONFIG_SND_AM33XX_SOC_EVM=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+#
+# SoC Audio for Freescale CPUs
+#
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+# CONFIG_SND_SOC_FSL_ESAI is not set
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
+CONFIG_SND_OMAP_SOC_RX51=m
+CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5677_SPI is not set
+CONFIG_SND_SOC_SGTL5000=m
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TWL4030=m
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+#
+# HID support
+#
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_HID_GENERIC=y
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH_DJ=y
+CONFIG_HID_LOGITECH_HIDPP=y
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+#
+# USB HID support
+#
+CONFIG_USB_HID=y
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_ULPI_BUS is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_U132_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=y
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+#
+# Platform Glue Layer
+#
+# CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+# CONFIG_USB_MUSB_AM35X is not set
+CONFIG_USB_MUSB_DSPS=y
+CONFIG_USB_MUSB_AM335X_CHILD=y
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_OF=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_ISP1760 is not set
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_DEBUG=m
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+# CONFIG_USB_ATM is not set
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_AM335X_CONTROL_USB=y
+CONFIG_AM335X_PHY_USB=y
+CONFIG_USB_GPIO_VBUS=y
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
+# CONFIG_USB_CONFIGFS_F_PRINTER is not set
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+# CONFIG_USB_G_MULTI_CDC is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+# CONFIG_USB_G_WEBCAM is not set
+CONFIG_USB_LED_TRIG=y
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_OMAP=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_PLTFM=y
+CONFIG_MMC_DW_EXYNOS=m
+# CONFIG_MMC_DW_K3 is not set
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_USB=m
+# CONFIG_MMC_MTK is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+#
+# LED drivers
+#
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8860=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_ISL12057=y
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PALMAS=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=y
+CONFIG_RTC_DRV_PCF8563=y
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_S5M=y
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_MCP795=m
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
+# CONFIG_RTC_DS1685_SYSFS_REGS is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=y
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_DRV_ZYNQMP is not set
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_OMAP=y
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_SNVS=y
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_OF=y
+CONFIG_DMA_OMAP=y
+CONFIG_FSL_EDMA=y
+# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_NBPFAXI_DMA is not set
+CONFIG_TI_CPPI41=y
+CONFIG_TI_DMA_CROSSBAR=y
+CONFIG_TI_EDMA=y
+CONFIG_DW_DMAC_CORE=y
+CONFIG_DW_DMAC=y
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_PRUSS=m
+# CONFIG_VFIO is not set
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+# CONFIG_R8723AU is not set
+# CONFIG_VT6656 is not set
+#
+# IIO staging drivers
+#
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16203=m
+CONFIG_ADIS16209=m
+CONFIG_ADIS16240=m
+CONFIG_LIS3L02DQ=m
+CONFIG_SCA3000=m
+#
+# Analog to digital converters
+#
+CONFIG_AD7606=m
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7780=m
+CONFIG_AD7816=m
+CONFIG_AD7192=m
+CONFIG_AD7280=m
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7152=m
+CONFIG_AD7746=m
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16060=m
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+#
+# Light sensors
+#
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_TSL2583=m
+CONFIG_TSL2x7x=m
+#
+# Active energy metering IC
+#
+CONFIG_ADE7753=m
+CONFIG_ADE7754=m
+CONFIG_ADE7758=m
+CONFIG_ADE7759=m
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+CONFIG_AD2S1210=m
+#
+# Triggers - standalone
+#
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_STAGING_MEDIA is not set
+#
+# Android
+#
+CONFIG_ASHMEM=y
+CONFIG_ANDROID_TIMED_OUTPUT=y
+CONFIG_ANDROID_TIMED_GPIO=m
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+CONFIG_SYNC=y
+# CONFIG_SW_SYNC is not set
+CONFIG_ION=y
+# CONFIG_ION_TEST is not set
+# CONFIG_ION_DUMMY is not set
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_DGAP is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1325=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
+# CONFIG_WILC1000_DRIVER is not set
+# CONFIG_MOST is not set
+# CONFIG_CHROME_PLATFORMS is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=y
+# CONFIG_CLK_QORIQ is not set
+CONFIG_COMMON_CLK_PALMAS=y
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_PXA is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+CONFIG_HWSPINLOCK=y
+#
+# Hardware Spinlock drivers
+#
+CONFIG_HWSPINLOCK_OMAP=y
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_OF=y
+CONFIG_CLKSRC_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLKSRC_TI_32K=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_TIMER_SP804=y
+# CONFIG_ATMEL_PIT is not set
+# CONFIG_SH_TIMER_CMT is not set
+# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
+# CONFIG_EM_TIMER_STI is not set
+CONFIG_MAILBOX=y
+CONFIG_OMAP2PLUS_MBOX=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+CONFIG_OF_IOMMU=y
+CONFIG_OMAP_IOMMU=y
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+CONFIG_ARM_SMMU=y
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+# CONFIG_STE_MODEM_RPROC is not set
+CONFIG_WKUP_M3_RPROC=y
+#
+# Rpmsg drivers
+#
+#
+# SOC (System On Chip) specific Drivers
+#
+# CONFIG_SOC_BRCMSTB is not set
+# CONFIG_SUNXI_SRAM is not set
+CONFIG_SOC_TI=y
+CONFIG_PM_DEVFREQ=y
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+#
+# DEVFREQ Drivers
+#
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_AXP288 is not set
+CONFIG_EXTCON_GPIO=y
+CONFIG_EXTCON_PALMAS=y
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=y
+CONFIG_MEMORY=y
+CONFIG_TI_EMIF=y
+CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_GPMC_DEBUG is not set
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_TRIGGER is not set
+CONFIG_IIO_TRIGGERED_EVENT=m
+#
+# Accelerometers
+#
+CONFIG_BMA180=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXCJK1013=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD799X=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_HI8435=m
+CONFIG_INA2XX_ADC=m
+CONFIG_MAX1027=m
+CONFIG_MAX1363=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS8688=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
+CONFIG_VF610_ADC=m
+CONFIG_VIPERBOARD_ADC=m
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_IAQCORE=m
+CONFIG_VZ89X=m
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+CONFIG_IIO_MS_SENSORS_I2C=m
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5686=m
+CONFIG_AD5755=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MAX5821=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+# CONFIG_VF610_DAC is not set
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+#
+# Frequency Synthesizers DDS/PLL
+#
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+#
+# Health Sensors
+#
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+#
+# Light sensors
+#
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_LTR501=m
+CONFIG_MAX44000=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_STK3310=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VEML6070=m
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+#
+# Triggers - standalone
+#
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+#
+# Digital potentiometers
+#
+CONFIG_DS1803=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_TPL0102=m
+#
+# Pressure sensors
+#
+CONFIG_BMP280=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+#
+# Proximity sensors
+#
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_SX9500=m
+#
+# Temperature sensors
+#
+CONFIG_MLX90614=m
+CONFIG_TMP006=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_OMAP_DMTIMER=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
+CONFIG_PWM_TIPWMSS=y
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+CONFIG_IRQCHIP=y
+CONFIG_OMAP_IRQCHIP=y
+# CONFIG_IPACK_BUS is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_FMC is not set
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+# CONFIG_PHY_DM816X_USB is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_OMAP_CONTROL_PHY=y
+CONFIG_OMAP_USB2=y
+CONFIG_TI_PIPE3=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_SAMSUNG_USB2=m
+# CONFIG_PHY_EXYNOS4210_USB2 is not set
+# CONFIG_PHY_EXYNOS4X12_USB2 is not set
+# CONFIG_PHY_EXYNOS5250_USB2 is not set
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+#
+# Performance monitor support
+#
+CONFIG_ARM_PMU=y
+CONFIG_RAS=y
+#
+# Android
+#
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_IPC_32BIT=y
+CONFIG_NVMEM=y
+# CONFIG_STM is not set
+# CONFIG_STM_DUMMY is not set
+# CONFIG_STM_SOURCE_CONSOLE is not set
+# CONFIG_INTEL_TH is not set
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+#
+# Firmware Drivers
+#
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_IO_TRACE is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=y
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_LOGFS=m
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+# CONFIG_HPFS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+# CONFIG_PSTORE is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+# CONFIG_AUFS_HNOTIFY is not set
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_XATTR=y
+# CONFIG_AUFS_FHSM is not set
+# CONFIG_AUFS_RDU is not set
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+# CONFIG_AUFS_BR_FUSE is not set
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_ROOT_NFS=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_PNFS is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+# CONFIG_NCPFS_SMALLDOS is not set
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+#
+# Kernel hacking
+#
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+CONFIG_DEBUG_INFO_SPLIT=y
+CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_DEBUG_KERNEL=y
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_SHIRQ is not set
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_TIMER_STATS=y
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_BPF_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_ENUM_MAP_FILE is not set
+CONFIG_TRACING_EVENTS_GPIO=y
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_TEST_LKM is not set
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_MEMTEST is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+# CONFIG_ARM_PTDUMP is not set
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+# CONFIG_DEBUG_UART_8250 is not set
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_CORESIGHT is not set
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_TRUSTED_KEYS is not set
+CONFIG_ENCRYPTED_KEYS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_AKCIPHER2=y
+# CONFIG_CRYPTO_RSA is not set
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+# CONFIG_CRYPTO_MCRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER=m
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+# CONFIG_CRYPTO_KEYWRAP is not set
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+# CONFIG_CRYPTO_POLY1305 is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+# CONFIG_CRYPTO_USER_API_RNG is not set
+# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+CONFIG_CRYPTO_DEV_OMAP_AES=m
+CONFIG_CRYPTO_DEV_OMAP_DES=m
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+#
+# Certificates for signature checking
+#
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+# CONFIG_CRYPTO_SHA1_ARM_CE is not set
+# CONFIG_CRYPTO_SHA2_ARM_CE is not set
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
+# CONFIG_CRYPTO_AES_ARM_CE is not set
+# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_BINARY_PRINTF=y
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+# CONFIG_CRC8 is not set
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_BCH=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_SG_SPLIT is not set
+CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_VIRTUALIZATION=y
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
index b638ddc..5b0e2df 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
@@ -28,6 +28,14 @@
 ############################################################################
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += " \
+SRC_URI += "\
-        file://0001-BBB-disable-console-cursor-blinking.patch \
+    file://usb-serial.cfg \
-        "
+    "
+KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
+KERNEL_GIT_URI_beaglebone = "git://github.com/beagleboard/linux;nobranch=1"
+BRANCH_beaglebone = "4.4"
+SRCREV_beaglebone = "dbe8c873f443cb8ac52e95790d0c958b81d7eddf"
+PV_beaglebone = "4.4.19+git${SRCPV}"
+DEPENDS_append_beaglebone = " lzop-native"
+RRECOMMENDS_${PN}_append_beaglebone = " bb-org-overlays"
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-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-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/base-files/base-files_3.0.14.bbappend b/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
deleted file mode 100644
index dbeb030..0000000
--- a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
+++ /dev/null
@@ -1,30 +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}:"
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/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/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf
deleted file mode 100644
index 1a2dadb..0000000
--- a/meta-vib3-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_vib3"
-BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_vib3 = "20"
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
deleted file mode 100644
index 30e2acc..0000000
--- a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
+++ /dev/null
@@ -1,34 +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$
-##
-############################################################################
-SRC_URI_remove = " \
-    file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \
-    file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \
-    file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \
-"
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
deleted file mode 100644
index 3ff042b..0000000
--- a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# Use our kernel instead of yocto which defaults to mainline 3.10.
-# Commit id of our kernel's include/uapi directory in kernel tree -
-# 8c37e1bfe7dd26a9d4cf4510460a75264c906444
-SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
-# Extracting linux.tar.bz2 creates directories
-# <top>/vibrante-oss-src/kernel
-S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
deleted file mode 100644
index ee61a74..0000000
--- a/meta-vib3-extras/recipes/linux/linux-nvidia/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-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
deleted file mode 100644
index 66f031f..0000000
--- a/meta-vib3-extras/recipes/linux/linux-nvidia/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-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
deleted file mode 100644
index 8bbc38b..0000000
--- a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
--- a/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 13:05:46.897056724 +0300
-+++ b/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 12:55:28.053751626 +0300
-@@ -1021,7 +1021,7 @@
- 
- static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld)
- {
-       u32 val, data;
-+       u32 val=0, data=0;
-        ktime_t now;
-        unsigned long rate;
-        unsigned long step = RATE_STEP(cld);
-@@ -3303,7 +3303,7 @@
- 
- static int monitor_get(void *data, u64 *val)
- {
-       u32 v, s;
-+       u32 v=0, s=0;
-        unsigned long flags;
-        struct clk *c = (struct clk *)data;
-        struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs;
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
deleted file mode 100644
index fc8fe9f..0000000
--- a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
--- a/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:34.912235128 +0300
-+++ b/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:55.739478254 +0300
-@@ -1331,7 +1331,7 @@
-  */
- static void tegra12_cpu_clk_init(struct clk *c)
- {
-       c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF;
-+       c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF;
- }
- 
- static int tegra12_cpu_clk_enable(struct clk *c)
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
deleted file mode 100644
index e59898d..0000000
--- a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
+++ /dev/null
@@ -1,65 +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 := "__default:${THISDIR}/${PN}:"
-DEPENDS_remove = "external-tegra-toolchain"
-do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot"
-SRC_URI += "\
-    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
-    file://0001-Change-extern-inline-to-static-inline.patch \
-    file://Fix_compile_error_in_tegra_drivers.patch \
-    file://Fix_compiler_error_in_tegra12_lock.patch \
-    "
-do_compile_prepend () {
-    # Cross compiling exports
-    export ARCH=${TARGET_ARCH}
-    export CROSS_COMPILE=${CROSS_COMPILE}
-    echo "CONFIG_FHANDLE=y" >> ${B}/.config
-    make olddefconfig
-}
-do_install_append() {
-    s=$(readlink -m "${S}")
-    kernsrc="${STAGING_KERNEL_DIR}"
-    if [ "${s}" != "${kernsrc}" ]; then
-        mkdir -p "${kernsrc}"
-        rm -rf "${kernsrc}"
-        mv "${S}" "${STAGING_KERNEL_DIR}"
-        ln -sf "${kernsrc}" "${s}"
-    fi
-}
-python do_patch () {
-    bb.build.exec_func('patch_do_patch', d)
-}
diff --git a/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
deleted file mode 100644
index d7353bc..0000000
--- a/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-# Append --enable-kernel flag to configure flags
-# only for target build case.
-# We are setting this to kernel 3.18 to keep glibc
-# compatbile across all 3.18 series
-# We will not support < 3.18 for V4L:
-EXTRA_OECONF_append_class-target = " \
-    --enable-kernel=3.18 \
-"
-# Search $PWD/eglibc-2.18 for additional patches
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-# Placeholder for patches
-SRC_URI_append_class-target = " \
-"
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
index f2bdba1..f2bdba1 100644
--- a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
+++ b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
index 07c9646..70ee515 100644
--- a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
+++ b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
@@ -1,4 +1,3 @@
 ############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
@@ -28,6 +27,11 @@
 ##
 ############################################################################
+do_unpack_append() {
+    rm -rf ${STAGING_KERNEL_DIR}
+    ln -s ${S} ${STAGING_KERNEL_DIR}
+}
 do_kernel_defconfig_prepend () {
 }
diff --git a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
deleted file mode 100644
index 629ccf4..0000000
--- a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 97a29d6..b0e4060 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*],
-                -Wno-gnu-variable-sized-type-not-at-end \
-         ])])
- 
-AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
-        [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
-               -flto -ffat-lto-objects])],
-        [AC_MSG_RESULT([skipping -flto, optimization not enabled])])
- AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
- 
- AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
-- 
-2.5.0
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
index dbeb030..53ea1e4 100644
--- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
+++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_remove = "file://0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch"
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
deleted file mode 100644
index f892961..0000000
--- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.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_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-    file://wayland-client.pc \
-    file://wayland-cursor.pc \
-    file://wayland-egl.pc \
-    file://wayland-server.pc \
-    file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \
-    "
-FILES_${PN} += "${libdir}/pkgconfig"
-WAYLAND_PACKAGES += "wayland-dev"
-do_install_append() {
-    install -d ${D}${libdir}/pkgconfig
-    install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig
-    install -d ${D}${includedir}
-    install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir}
-}
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
deleted file mode 100644
index e639768..0000000
--- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-datarootdir=${prefix}/share
-pkgdatadir=/usr/share/wayland
-libdir=/usr/lib
-includedir=/usr/include
-Name: Wayland Client
-Description: Wayland client side library
-Version: 1.6.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lwayland-client
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
deleted file mode 100644
index 36538ad..0000000
--- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-Name: Wayland Cursor
-Description: Wayland cursor helper library
-Version: 1.6.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lwayland-cursor
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
deleted file mode 100644
index dc8393f..0000000
--- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
-Name: wayland-egl
-Description: wayland-egl library
-Version: 9.1.6
-Libs: -L${libdir} -lwayland-egl
-Cflags: -I${includedir}
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
deleted file mode 100644
index dab87b9..0000000
--- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-datarootdir=${prefix}/share
-pkgdatadir=/usr/share/wayland
-libdir=/usr/lib
-includedir=/usr/include
-Name: Wayland Server
-Description: Server side implementation of the Wayland protocol
-Version: 1.6.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lwayland-server
diff --git a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch
new file mode 100644
index 0000000..5e0e6bf
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch
@@ -0,0 +1,105 @@
+build: always build wayland-scanner
+The previous idiom for building a cross-compiled Wayland is to build once for
+the build host (with --enable-scanner --disable-libraries) to get a
+wayland-scanner binary that can then be used in a cross-compile (with
+--disable-scanner).  The problem with this is that the cross wayland is missing
+a wayland-scanner binary, which means you then can't do any Wayland development
+on the target.
+Instead, always build wayland-scanner for the target and change
+--enable/disable-scanner to --with/without-host-scanner.  Normal builds use the
+default of --without-host-scanner and run the wayland-scanner it just built, and
+cross-compiled builds pass --with-host-scanner to use a previously built host
+scanner but still get a wayland-scanner to install.
+(a theoretically neater solution would be to build two scanners if required (one
+to run and one to install), but automake makes this overly complicated)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+Upstream-Status: Submitted
+diff --git a/Makefile.am b/Makefile.am
+index c19494f..c2d929b 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES =               \
+ 
+ pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
+ 
+-if ENABLE_SCANNER
+-wayland_scanner = $(top_builddir)/wayland-scanner
+ bin_PROGRAMS = wayland-scanner
+ wayland_scanner_SOURCES = src/scanner.c
+ wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS)
+ wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
+-$(BUILT_SOURCES) : wayland-scanner
+ pkgconfig_DATA += src/wayland-scanner.pc
+-else
+
+if HOST_SCANNER
+ wayland_scanner = wayland-scanner
+else
+$(BUILT_SOURCES) : wayland-scanner
+wayland_scanner = $(top_builddir)/wayland-scanner
+ endif
+ 
+ protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
+diff --git a/configure.ac b/configure.ac
+index c2a804e..de0b02f 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+              [[#include <time.h>]])
+ AC_CHECK_HEADERS([execinfo.h])
+ 
+-AC_ARG_ENABLE([scanner],
+-              [AC_HELP_STRING([--disable-scanner],
+-                              [Disable compilation of wayland-scanner])],
+-              [],
+-              [enable_scanner=yes])
+AC_ARG_WITH([host-scanner],
+            [AC_HELP_STRING([--with-host-scanner],
+                            [Use a host wayland-scanner])],
+            [],
+            [with_host_scanner=no])
+ 
+ AC_ARG_ENABLE([documentation],
+              [AC_HELP_STRING([--disable-documentation],
+@@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation],
+              [],
+              [enable_documentation=yes])
+ 
+-AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
+AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes)
+ 
+ AC_ARG_WITH(icondir, [  --with-icondir=<dir>    Look for cursor icons here],
+                     [  ICONDIR=$withval],
+                     [  ICONDIR=${datadir}/icons])
+ AC_SUBST([ICONDIR])
+ 
+-if test "x$enable_scanner" = "xyes"; then
+-       PKG_CHECK_MODULES(EXPAT, [expat], [],
+-               [AC_CHECK_HEADERS(expat.h, [],
+-                       [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
+-                SAVE_LIBS="$LIBS"
+-                AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
+-                       [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
+-                EXPAT_LIBS="$LIBS"
+-                LIBS="$SAVE_LIBS"
+-                AC_SUBST(EXPAT_LIBS)
+-               ])
+-fi
+PKG_CHECK_MODULES(EXPAT, [expat], [],
+       [AC_CHECK_HEADERS(expat.h, [],
+               [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
+        SAVE_LIBS="$LIBS"
+        AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
+               [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
+        EXPAT_LIBS="$LIBS"
+        LIBS="$SAVE_LIBS"
+        AC_SUBST(EXPAT_LIBS)
+       ])
+ 
+ AC_PATH_PROG(XSLTPROC, xsltproc)
+ AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend
index 54dca0f..463d5a1 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
+++ b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend
@@ -27,9 +27,10 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_append := ":${NVLAYER_DIR}/packages:${LNX_TOPDIR}/${PN}:${THISDIR}/${PN}"
-SRC_URI += "\
-    file://usb-serial.cfg \
+SRC_URI_remove = "file://${NVLAYER_DIR}/packages/wayland-1.8.1-src.tar.gz"
+SRC_URI = "\
+    file://wayland-1.8.1-src.tar.gz \
+    file://always-build-scanner.patch \
    "
-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-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
new file mode 100644
index 0000000..062da5c
--- /dev/null
+++ b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
@@ -0,0 +1,13 @@
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
+++ weston-1.5.0/configure.ac
+@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then
+        AC_MSG_ERROR([wayland-scanner is needed to compile weston])
+ fi
+ 
+-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
+ 
+ AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
+ 
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend b/meta-vib4-extras/recipes/weston/weston_%.bbappend
index 5352ed7..cfc286f 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
+++ b/meta-vib4-extras/recipes/weston/weston_%.bbappend
@@ -27,13 +27,10 @@
 ##
 ############################################################################
-# kernel image files are not needed in the image
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-RDEPENDS_kernel-base = ""
+S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston"
-config_script () {
+do_install_prepend() {
-    # FunctionFS for adb
+    mkdir -p ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
+    cp ${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston/tools/weston.ini ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools/weston.ini
-    echo "CONFIG_USB_ACM=m"         >> ${S}/.config
 }
-B = "${S}"
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index 0456023..2209f61 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -9,10 +9,11 @@ inherit cmake_qt5
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
 BRANCH = "master"
-SRCREV = "6262eaeaee74109f9c1bd85de99c9b039d8938f5"
+SRCREV = "add939931c7b7ca0fb413b3457ff4b5be6282451"
 PV = "master+git${SRCPV}"
-DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d"
+DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi \
+           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 66703c6..bb188f8 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -34,6 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 inherit qt5-module systemd
 require recipes-qt/qt5/qt5-git.inc
+QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-neptune-ui"
 QT_MODULE_BRANCH = "master"
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
index 7819941..4bf7ef8 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -35,6 +35,7 @@ LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
+QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-qmllive"
 QT_MODULE_BRANCH = "master"
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 028df78..bc3ff6b 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -31,19 +31,17 @@ DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
-inherit qmake5
+inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
-SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76"
+SRCREV = "c23f2cd6daffbed3c8b7f219d75bf0e657359755"
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
-RDEPENDS_${PN} = "libcrypto"
+RDEPENDS_${PN} = "libcrypto ${PN}-tools"
 EXTRA_QMAKEVARS_PRE += "\
    ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
-    -config enable-dummydata \
-    -config enable-ivi-logging \
    -config install-prefix=/usr \
    -config systemd-workaround \
    -config hardware-id=neptune \
@@ -56,7 +54,5 @@ do_install_append() {
 FILES_${PN} += "\
    /opt/am \
-    ${libdir}/appman \
+    ${datadir}/dbus-1 \
-    ${datadir}/dbus-1"
+    "
-FILES_${PN}-dbg += "${libdir}/appman/.debug"
-FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/*.prl"
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 0c50457..7c487ac 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -38,6 +38,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
-SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a"
+PACKAGECONFIG ?= "taglib"
+PACKAGECONFIG[taglib] = "CONFIG+=config_taglib CONFIG+=done_config_taglib,CONFIG+=done_config_taglib,taglib"
-DEPENDS = "qtbase qtdeclarative"
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
+SRCREV = "1163c5e8e269d73b4e422a12e47f7db34285c4a0"
+DEPENDS = "qtbase qtdeclarative qtmultimedia"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index b06446e..25e28df 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -34,6 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
+QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-qtwebbrowser"
 QT_MODULE_BRANCH = "dev"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index eafae4e..f1482a4 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -35,7 +35,7 @@ inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \
+    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;${QT_MODULE_BRANCH_PARAM};protocol=http \
    file://appcontroller.conf \
    "
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index eec5bc4..3fbc0a0 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -33,11 +33,13 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
 inherit qmake5
+QT_PROJECT_GIT = "git://github.com/qtproject"
 SRC_URI = " \
-    ${QT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \
+    ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \
    ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
    ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
-    ${QT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
+    ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \
    https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \
    "
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
index 9cd1f28..2fb3f8c 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -29,7 +29,7 @@
 DESCRIPTION = "Virtual input plugin for QtSimulator"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://qvinput.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17"
+LIC_FILES_CHKSUM = "file://qvinput.h;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
 inherit qt5-module
@@ -37,7 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
    "
-SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe"
+SRCREV = "011e1c40716c8323f247e927de6640653d6811c4"
 BRANCH = "master"
 PV = "1.0+git${SRCPV}"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index e131b2a..c3f4061 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -34,6 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
+QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-boot2qt-launcher"
 SRC_URI += " \
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb
index d63df0e..8834e19 100644
--- a/recipes-qt/b2qt-addons/democompositor_git.bb
+++ b/recipes-qt/b2qt-addons/democompositor_git.bb
@@ -34,9 +34,10 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginli
 inherit qmake5
 require recipes-qt/qt5/qt5-git.inc
+QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-boot2qt-demos"
-SRCREV = "a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e"
+SRCREV = "b9585b440819e1444b20f30435f81c46801158c5"
 S = "${WORKDIR}/git/wayland/democompositor/"
diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb
new file mode 100644
index 0000000..b1c9a0d
--- /dev/null
+++ b/recipes-qt/b2qt-addons/qdbd.bb
@@ -0,0 +1,79 @@
+############################################################################
+##
+## 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 = "Qt Debug Bridge Daemon"
+SECTION = "devel"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://qdbd/main.cpp;md5=37093977d3f09e6366def8955c8c71e6;beginline=1;endline=18"
+inherit qmake5
+SRC_URI = "git://codereview.qt-project.org/tqtc-boot2qt/qdb;branch=${BRANCH};protocol=ssh \
+           file://defaults \
+           file://qdbd.service \
+           file://qdbd-init.sh \
+          "
+SRCREV = "02a7d1ab030b83feb3300df5149b9ec0518975f4"
+BRANCH = "master"
+PV = "0.1+git${SRCPV}"
+DEPENDS = "qtbase"
+RRECOMMENDS_${PN} += "kernel-module-usb-f-fs kernel-module-usb-f-rndis"
+S = "${WORKDIR}/git"
+EXTRA_QMAKEVARS_PRE = "CONFIG+=daemon_only"
+do_configure_append() {
+    if [ -n "${ADB_PRODUCTID}" ]; then
+        sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/defaults
+    fi
+}
+do_install_append() {
+    install -m 0755 ${WORKDIR}/qdbd-init.sh ${D}${bindir}/
+    install -m 0755 -d ${D}${sysconfdir}/init.d
+    ln -s ${bindir}/qdbd-init.sh ${D}${sysconfdir}/init.d/
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/qdbd.service ${D}${systemd_unitdir}/system/
+    install -m 0755 -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/defaults ${D}${sysconfdir}/default/qdbd
+}
+INITSCRIPT_NAME = "qdbd-init.sh"
+INITSCRIPT_PARAMS = "defaults 96"
+SYSTEMD_SERVICE_${PN} = "qdbd.service"
+# adbd is started by default instead of qdbd
+SYSTEMD_AUTO_ENABLE = "disable"
+inherit update-rc.d systemd
diff --git a/recipes-qt/b2qt-addons/qdbd/defaults b/recipes-qt/b2qt-addons/qdbd/defaults
new file mode 100644
index 0000000..1ff78fb
--- /dev/null
+++ b/recipes-qt/b2qt-addons/qdbd/defaults
@@ -0,0 +1,3 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
new file mode 100755
index 0000000..446ea3f
--- /dev/null
+++ b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh
@@ -0,0 +1,117 @@
+#! /bin/sh
+###############################################################################
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:BSD$
+## You may use this file under the terms of the BSD license as follows:
+##
+## "Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+##   * Redistributions of source code must retain the above copyright
+##     notice, this list of conditions and the following disclaimer.
+##   * Redistributions in binary form must reproduce the above copyright
+##     notice, this list of conditions and the following disclaimer in
+##     the documentation and/or other materials provided with the
+##     distribution.
+##   * Neither the name of The Qt Company Ltd nor the names of its
+##     contributors may be used to endorse or promote products derived
+##     from this software without specific prior written permission.
+##
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+##
+## $QT_END_LICENSE$
+###############################################################################
+MANUFACTURER="The Qt Company"
+PRODUCT_STRING="Boot2Qt Ethernet/RNDIS connection"
+DAEMON=/usr/bin/qdbd
+CONFIGFS_PATH=/sys/kernel/config
+GADGET_CONFIG=$CONFIGFS_PATH/usb_gadget/g1
+. /etc/default/qdbd
+function initialize_gadget() {
+    # Initialize gadget with first UDC driver
+    for driverpath in /sys/class/udc/*; do
+        drivername=`basename $driverpath`
+        echo "$drivername" > $GADGET_CONFIG/UDC
+        break
+    done
+}
+function disable_gadget() {
+    echo "" > $GADGET_CONFIG/UDC
+}
+case "$1" in
+start)
+    modprobe libcomposite
+    # Gadget configuration
+    mkdir -p $GADGET_CONFIG
+    echo $VENDOR > $GADGET_CONFIG/idVendor
+    echo $PRODUCT > $GADGET_CONFIG/idProduct
+    mkdir -p $GADGET_CONFIG/strings/0x409
+    echo $MANUFACTURER > $GADGET_CONFIG/strings/0x409/manufacturer
+    echo $PRODUCT_STRING > $GADGET_CONFIG/strings/0x409/product
+    echo ${SERIAL:0:32} > $GADGET_CONFIG/strings/0x409/serialnumber
+    mkdir -p $GADGET_CONFIG/configs/c.1/strings/0x409
+    echo "USB Ethernet + QDB" > $GADGET_CONFIG/configs/c.1/strings/0x409/configuration
+    mkdir -p $GADGET_CONFIG/functions/rndis.usb0
+    mkdir -p $GADGET_CONFIG/functions/ffs.qdb
+    ln -sf $GADGET_CONFIG/functions/rndis.usb0 $GADGET_CONFIG/configs/c.1
+    ln -sf $GADGET_CONFIG/functions/ffs.qdb $GADGET_CONFIG/configs/c.1
+    # Function fs mountpoints
+    mkdir -p /dev/usb-ffs
+    chmod 770 /dev/usb-ffs
+    mkdir -p /dev/usb-ffs/qdb
+    chmod 770 /dev/usb-ffs/qdb
+    mount -t functionfs qdb /dev/usb-ffs/qdb -o uid=0,gid=0
+    shift
+    start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
+    sleep 1
+    initialize_gadget
+    ;;
+stop)
+    disable_gadget
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
+    umount /dev/usb-ffs/qdb
+    rm $GADGET_CONFIG/configs/c.1/rndis.usb0
+    rm $GADGET_CONFIG/configs/c.1/ffs.qdb
+    rmdir $GADGET_CONFIG/configs/c.1/strings/0x409
+    rmdir $GADGET_CONFIG/configs/c.1
+    rmdir $GADGET_CONFIG/functions/rndis.usb0
+    rmdir $GADGET_CONFIG/functions/ffs.qdb
+    rmdir $GADGET_CONFIG/strings/0x409
+    rmdir $GADGET_CONFIG
+    ;;
+restart)
+    disable_gadget
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
+    shift
+    start-stop-daemon --start --quiet --exec $DAEMON -- $@ &
+    sleep 1
+    initialize_gadget
+    ;;
+*)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
+exit 0
diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd.service b/recipes-qt/b2qt-addons/qdbd/qdbd.service
new file mode 100644
index 0000000..88806a2
--- /dev/null
+++ b/recipes-qt/b2qt-addons/qdbd/qdbd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Qt Debug Bridge Daemon
+After=network.target
+Before=adbd.service
+Conflicts=adbd.service
+[Service]
+Type=forking
+ExecStart=/usr/bin/qdbd-init.sh start
+ExecStop=/usr/bin/qdbd-init.sh stop
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
index b60d9a0..179831a 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -42,14 +42,10 @@ IMAGE_FEATURES += "\
        hwcodecs \
        "
-inherit core-image
+inherit core-image qbsp-image
-inherit bootfs-image
 inherit consistent_timestamps
-MACHINE_EXTRA_INSTALL_QT ?= ""
 IMAGE_INSTALL += "\
-    ${MACHINE_EXTRA_INSTALL_QT} \
    packagegroup-b2qt-embedded-base \
    packagegroup-b2qt-embedded-tools \
    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
diff --git a/recipes-qt/images/b2qt-embedded-ci-image.bb b/recipes-qt/images/b2qt-embedded-ci-image.bb
new file mode 100644
index 0000000..09dbcf8
--- /dev/null
+++ b/recipes-qt/images/b2qt-embedded-ci-image.bb
@@ -0,0 +1,74 @@
+############################################################################
+##
+## 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 = "B2Qt on embedded Linux SDK image"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+PR = "r0"
+IMAGE_FEATURES += "\
+        package-management \
+        ssh-server-dropbear \
+        tools-debug \
+        debug-tweaks \
+        hwcodecs \
+        "
+inherit core-image
+IMAGE_INSTALL += "\
+    packagegroup-b2qt-embedded-base \
+    packagegroup-b2qt-embedded-tools \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    packagegroup-b2qt-qt5-modules \
+    "
+ROOTFS_POSTINSTALL_COMMAND += "remove_qt_from_rootfs;"
+python remove_qt_from_rootfs() {
+    import subprocess
+    # remove qtbase and all dependent packages
+    image_rootfs = d.getVar('IMAGE_ROOTFS', True)
+    opkg_conf = d.getVar("IPKGCONF_TARGET", True)
+    opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg")
+    opkg_args = "--volatile-cache -f %s -o %s " % (opkg_conf, image_rootfs)
+    opkg_args += d.getVar("OPKG_ARGS", True)
+    cmd = "%s %s --force-remove --force-removal-of-dependent-packages remove %s" % \
+        (opkg_cmd, opkg_args, 'qtbase')
+    try:
+        bb.note(cmd)
+        output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT)
+        bb.note(output)
+    except subprocess.CalledProcessError as e:
+        bb.fatal("Unable to remove packages. Command '%s' "
+                 "returned %d:\n%s" % (e.cmd, e.returncode, e.output))
+}
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 88b5d33..4d0bfa4 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -42,14 +42,10 @@ IMAGE_FEATURES += "\
        hwcodecs \
        "
-inherit core-image
+inherit core-image qbsp-image
-inherit bootfs-image
 inherit consistent_timestamps
-MACHINE_EXTRA_INSTALL_QT ?= ""
 IMAGE_INSTALL += "\
-    ${MACHINE_EXTRA_INSTALL_QT} \
    packagegroup-b2qt-embedded-base \
    packagegroup-b2qt-embedded-tools \
    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
diff --git a/conf/distro/include/imx6.inc b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index e686e85..ebd12c5 100644
--- a/conf/distro/include/imx6.inc
+++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -27,18 +27,21 @@
 ##
 ############################################################################
-BBMASK ?= " "
+DESCRIPTION = "Meta task for QBSP creation"
-BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
-IMAGE_FSTYPES += "ext3 sdcard"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-MACHINE_EXTRA_INSTALL += "\
+# get Qt version number
-    libgal-mx6 \
+require recipes-qt/qt5/qt5-git.inc
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+S = "${WORKDIR}"
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-    "
-MACHINE_EXTRA_INSTALL_SDK += " \
+inherit qbsp
-    libgal-mx6 \
-    "
+PV = "1.1"
+QBSP_INSTALLER_COMPONENT = "qt.automotive.10.yocto.${MACHINE}"
+QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Automotive/${MACHINE}"
+QBSP_SDK_TASK = "meta-toolchain-b2qt-automotive-qt5-sdk"
+QBSP_IMAGE_TASK = "b2qt-automotive-qt5-image"
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index 4a7f172..56da506 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -27,24 +27,22 @@
 ##
 ############################################################################
-DESCRIPTION = "B2Qt on embedded Linux SDK image"
+DESCRIPTION = "Meta task for QBSP creation"
 LICENSE = "The-Qt-Company-DCLA-2.1"
-PR = "r0"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
+# get Qt version number
+require recipes-qt/qt5/qt5-git.inc
+S = "${WORKDIR}"
+inherit qbsp
-IMAGE_FEATURES += "\
+PV := "${@d.getVar('PV', True)[0:5]}"
-        package-management \
-        ssh-server-dropbear \
-        tools-debug \
-        debug-tweaks \
-        hwcodecs \
-        "
-inherit core-image
+VERSION_SHORT = "${@d.getVar('QT_MODULE_BRANCH', True).replace('.','')}"
-inherit bootfs-image
+QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${MACHINE}"
+QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Boot2Qt/${MACHINE}"
-IMAGE_INSTALL += "\
+QBSP_SDK_TASK = "meta-toolchain-b2qt-embedded-qt5-sdk"
-    packagegroup-b2qt-embedded-base \
+QBSP_IMAGE_TASK = "b2qt-embedded-qt5-image"
-    packagegroup-b2qt-embedded-tools \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
-    "
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
index d5f8ce7..777bffe 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -27,13 +27,6 @@
 ##
 ############################################################################
-DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
+require recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
-PR = "r0"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-inherit populate_b2qt_sdk
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}"
-TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target"
+SDKIMAGE_FEATURES = "dev-pkgs"
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 3d60eed..05dc416 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -39,4 +39,5 @@ RDEPENDS_${PN} += " \
    b2qt-launcher \
    b2qt-demos \
    ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    ${@bb.utils.contains("ENABLE_QDBD", "1", "qdbd", "", d)} \
    "
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..6c1f022 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -35,11 +35,11 @@ inherit packagegroup qtquickcompiler
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-MACHINE_EXTRA_INSTALL_QT_SDK ?= ""
+MACHINE_EXTRA_INSTALL_SDK ?= ""
 RDEPENDS_${PN} += " \
-    ${MACHINE_EXTRA_INSTALL_QT_SDK} \
+    ${MACHINE_EXTRA_INSTALL_SDK} \
-    packagegroup-b2qt-embedded-toolchain-target \
+    packagegroup-core-standalone-sdk-target \
    \
    qt3d-dev \
    qtbase-dev \
@@ -49,7 +49,6 @@ RDEPENDS_${PN} += " \
    qtconnectivity-dev \
    qtdatavis3d-dev \
    qtdeclarative-dev \
-    qtdeclarative-render2d-dev \
    qtdeclarative-staticdev \
    qtdeviceutilities-dev \
    qtgraphicaleffects-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index c63ddb8..c551cf0 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -42,7 +42,6 @@ RDEPENDS_${PN} += " \
    qtconnectivity \
    qtdatavis3d \
    qtdeclarative \
-    qtdeclarative-render2d \
    qtdeclarative-tools \
    qtdeviceutilities \
    qtgraphicaleffects \
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
index 26ae06e..03cba46 100644
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
+++ b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
@@ -27,31 +27,22 @@
 ##
 ############################################################################
-DESCRIPTION = "U-Boot script to start up BeagleBone Black"
+DESCRIPTION = "Qt Installer Framework"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-PR = "r0"
-COMPATIBLE_MACHINE = "(beaglebone)"
+inherit bin_package native
-PV = "20140225"
-SRC_URI = "file://uEnv.txt"
+SRC_URI = "http://ci-files02-hki.ci.local/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z"
-inherit deploy
+SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d"
+SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6"
-do_deploy () {
+S = "${WORKDIR}/ifw-pkg"
-    install -d ${DEPLOYDIR}
-    install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt
-    cd ${DEPLOYDIR}
+do_install() {
-    rm -f uEnv-${MACHINE}.txt
+    install -d ${D}${bindir}
-    ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt
+    install -m 0755 -t ${D}${bindir} ${S}/bin/*
 }
-addtask deploy after do_install before do_build
+INSANE_SKIP_${PN} += "already-stripped"
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 04ffab9..8863105 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
+SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index aa89e73..d0c8a35 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -27,10 +27,4 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRCREV = "629de0e31253d9c8b388f6f549aa3ad6abf3c630"
-SRC_URI_append_class-target = " \
-    file://0001-Remove-qgltf.patch \
-    "
-SRCREV = "0eac16fbda846c951f9b3887199e72b66f5aacd7"
diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend
index 023411a..d69604a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bbappend
+++ b/recipes-qt/qt5/qtbase-native_git.bbappend
@@ -27,7 +27,7 @@
 ##
 ############################################################################
-SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
+SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index 61235d4..6fff60b 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -27,19 +27,23 @@
 ##
 ############################################################################
-PACKAGECONFIG_GL = "gles2 eglfs"
+PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 eglfs', 'no-opengl', d)}"
+# emulator is exception due to qtglesstream
+PACKAGECONFIG_GL_emulator = "gles2 eglfs"
 PACKAGECONFIG += " \
    accessibility \
-    alsa \
    cups \
    fontconfig \
+    freetype \
    glib \
-    iconv \
    icu \
+    libinput \
    linuxfb \
+    qml-debug \
    sql-sqlite \
    tslib \
-    libinput \
    xkbcommon-evdev \
    "
@@ -53,5 +57,4 @@ do_configure_prepend() {
    install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
 }
-SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
+SRCREV = "4c0760d327e390a37d0d6ce2016d3a8c5b87a119"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend
index 8c18714..4c5d330 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bbappend
+++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0"
+SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e"
diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend
index fa83e28..b8dbec4 100644
--- a/recipes-qt/qt5/qtcharts_git.bbappend
+++ b/recipes-qt/qt5/qtcharts_git.bbappend
@@ -29,4 +29,4 @@
 inherit qtquickcompiler
-SRCREV = "da071825245a4ec1dc4904a9d3329db5a132c074"
+SRCREV = "38386fda213cd50e3a3284b69ae15d5f33a7e049"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index c1a9bbd..8352ad8 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
-SRCREV = "d884d20c5530b67fbd2fba35cdb71a9f969196be"
+SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend
index bb15587..edfb5ac 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bbappend
+++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b"
+SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend
index 152892e..6b24328 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "2a992040e2ef3f9dab087be3bfac05e28596672b"
+SRCREV = "884d06db09bc6179baa3add42ff4ef5f3cd0e523"
diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb
index 399b320..0dc1a5d 100644
--- a/recipes-qt/qt5/qtdeviceutilities.bb
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -40,9 +40,9 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \
+    git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \
    "
-SRCREV = "129e04b7aa0c73bedab3671d2de7599f7b9af9d6"
+SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c"
 DEPENDS = "qtbase qtdeclarative qtconnectivity"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
index 8cc0676..2895468 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2"
+SRCREV = "863682782bd7ba3edc33d3e13938437af0637320"
diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend
index 14d86cb..9b82ddd 100644
--- a/recipes-qt/qt5/qtimageformats_git.bbappend
+++ b/recipes-qt/qt5/qtimageformats_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e"
+SRCREV = "65db62e4398c5ddfba1ea7825987b3f4ab04369e"
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index 52c490e..9d8cbde 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy"
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
-SRCREV = "de5be121d84b062f1b72c91dddc877e5e88babc0"
+SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 4a71a0f..0b68fe8 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)
                  ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
                  ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
-SRCREV = "e4aef963cbd32274669af6b66158f6f0ca4ba3ed"
+SRCREV = "77567bad82081ffb166578bdeac52fb1f2dce464"
diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb
index 9cafd8c..acdeb58 100644
--- a/recipes-qt/qt5/qtotaupdate.bb
+++ b/recipes-qt/qt5/qtotaupdate.bb
@@ -37,6 +37,6 @@ require recipes-qt/qt5/qt5-git.inc
 QT_GIT = "git://github.com/qt"
 QT_MODULE_BRANCH = "master"
-SRCREV = "f48ab751dd43906d5b9492e3f124b94f189b9971"
+SRCREV = "9aff4083765a62a2b6d629971dba602646ffd3d4"
 DEPENDS = "qtbase qtdeclarative ostree"
diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb
index 4d0fb6a..fd2a901 100644
--- a/recipes-qt/qt5/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5/qtquickcompiler_git.bb
@@ -37,7 +37,7 @@ SRC_URI = " \
    git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
    "
-SRCREV = "033370939c8d969bfcb529745f643ee5d8a08790"
+SRCREV = "f7d0d43749d9bbd4c695738697ad95998a49956a"
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
index 3e796ed..5b32995 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "6f6e073815d5b05aba553b83809fb701541260c6"
+SRCREV = "cce0aadcd7a15f026c265b23b6e9dbe3310b70b1"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend
index d3ece15..5d7e7db 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48"
+SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index d248cf0..68d8ed3 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -30,4 +30,4 @@
 EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
 DEPENDS_emulator += "qtsimulator"
-SRCREV = "5a57beaaa5f637070ccbf30d79ad27861134c7a8"
+SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend
index 2d7e0ee..5e8d7ad 100644
--- a/recipes-qt/qt5/qtserialbus_git.bbappend
+++ b/recipes-qt/qt5/qtserialbus_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "768b2d463663104daae44f564f09c3a10e2e6ad6"
+SRCREV = "b11cf357e178aee4b9fa051014e0ec68b7338361"
diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend
index 498aeb6..8c516e8 100644
--- a/recipes-qt/qt5/qtserialport_git.bbappend
+++ b/recipes-qt/qt5/qtserialport_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "0b9f41c28cece4fe51011083e646aba405ec3a65"
+SRCREV = "4e667fa7f88144e198692d9794baacc86bb4eb98"
diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend
index d9ebe0b..eed87dd 100644
--- a/recipes-qt/qt5/qtsvg_git.bbappend
+++ b/recipes-qt/qt5/qtsvg_git.bbappend
@@ -27,5 +27,4 @@
 ##
 ############################################################################
-SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684"
+SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index 5e1f3d2..8e8b4df 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -30,4 +30,4 @@
 EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
 DEPENDS_emulator += "qtsimulator"
-SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a"
+SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index 6f2c016..56ac513 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "8575ed82ff0dd43aed8f5de67b4cfef06fec8c33"
+SRCREV = "4d02101ae8d655c9a5e0152857e0edb0a683ebbf"
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend
index dc7250c..11e1de5 100644
--- a/recipes-qt/qt5/qttranslations_git.bbappend
+++ b/recipes-qt/qt5/qttranslations_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "c4795ce81f9165a05e6f918066c671808447c539"
+SRCREV = "3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
index d1a1bbc..f6b9550 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
@@ -29,6 +29,6 @@
 inherit qtquickcompiler
-SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308"
 PACKAGECONFIG = "lipi-toolkit lang-all hunspell"
+SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
deleted file mode 100644
index 7661cbe..0000000
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ /dev/null
@@ -1,30 +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$
-##
-############################################################################
-SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend
index 7661cbe..35cc56d 100644
--- a/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/recipes-qt/qt5/qtwayland_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
+SRCREV = "725c71bcb1b5f47e824b45346803250d4a10afdc"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index e19dfe7..ebb1b0f 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "31eb0d8c7d78fe60dbad94091a56e97b4fcaa52b"
+SRCREV = "8cc9153f413c36d505794adfaca4f4724692fa81"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
index c6380f9..2af19e8 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch
@@ -12,10 +12,10 @@ work properly.
 1 file changed, 18 deletions(-)
 diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-index 0ce9980..8963d11 100644
+index 58aa147..4ab682a 100644
 --- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
 +++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
-@@ -1014,24 +1014,6 @@ void FeatureInfo::InitializeFeatures() {
+@@ -1258,26 +1258,6 @@ void FeatureInfo::InitializeFeatures() {
     }
   }
 
@@ -36,10 +36,12 @@ index 0ce9980..8963d11 100644
 -    validators_.read_pixel_format.AddValue(GL_RG_EXT);
 -    validators_.render_buffer_format.AddValue(GL_R8_EXT);
 -    validators_.render_buffer_format.AddValue(GL_RG8_EXT);
+-    validators_.texture_unsized_internal_format.AddValue(GL_RED_EXT);
+-    validators_.texture_unsized_internal_format.AddValue(GL_RG_EXT);
 -  }
   UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg);
 
- #if !defined(OS_MACOSX)
+   bool has_opengl_dual_source_blending =
 -- 
 1.9.1
diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend
index 57a9903..4112eb2 100644
--- a/recipes-qt/qt5/qtwebengine_git.bbappend
+++ b/recipes-qt/qt5/qtwebengine_git.bbappend
@@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \
    file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
    "
-SRCREV_qtwebengine = "9cc97f0c63049a8076476acc89c875c9e240abfb"
+SRCREV_qtwebengine = "dc09ed399219ba6dab7368b04f3946131e8089fd"
-SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10"
+SRCREV_chromium = "15f8e8e3971c73b9ca8058c7441e5bce8ac42fa9"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend
index 69443dd..db60918 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bbappend
+++ b/recipes-qt/qt5/qtwebsockets_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371"
+SRCREV = "5e66a1c5d25caef259e6e8b41023004c2b8de355"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
index b83ba05..80ae6d9 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-SRCREV = "89dbcc4f807015736a8ce3393b857735019d098d"
+SRCREV = "594ad16ae17072a44219228783f2ae051f88eba0"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
index eefd6a3..f893746 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
@@ -1,4 +1,4 @@
-From ccc6013f1e55b67981fb336aba657aea1520aeda Mon Sep 17 00:00:00 2001
+From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Tue, 20 Sep 2016 11:02:50 +0300
 Subject: [PATCH] Disable connman when booting over NFS
@@ -8,13 +8,13 @@ Subject: [PATCH] Disable connman when booting over NFS
 1 file changed, 1 insertion(+)
 diff --git a/src/connman.service.in b/src/connman.service.in
-index 8f7f342..8470f91 100644
+index 09dfec9..4132cf7 100644
 --- a/src/connman.service.in
 +++ b/src/connman.service.in
-@@ -3,6 +3,7 @@ Description=Connection service
+@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
- After=dbus.service network-pre.target
+ After=dbus.service network-pre.target systemd-sysusers.service
- Before=network.target remote-fs-pre.target
+ Before=network.target multi-user.target shutdown.target
- Wants=network.target remote-fs-pre.target
+ Wants=network.target
 +ConditionKernelCommandLine=!root=/dev/nfs
 
 [Service]
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/init-ifupdown/init-ifupdown/tibidabo/interfaces b/recipes/init-ifupdown/init-ifupdown/tibidabo/interfaces
deleted file mode 100644
index cb45575..0000000
--- a/recipes/init-ifupdown/init-ifupdown/tibidabo/interfaces
+++ /dev/null
@@ -1,37 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wireless interfaces
-iface wlan0 inet dhcp
-        wireless_mode managed
-        wireless_essid any
-        wpa-driver wext
-        wpa-conf /etc/wpa_supplicant.conf
-iface atml0 inet dhcp
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
-iface eth1 inet dhcp
-auto pt0
-iface pt0 inet dhcp
-    hostname `/bin/hostname`
-auto pt1
-iface pt1 inet dhcp
-    hostname `/bin/hostname`
-# Ethernet/RNDIS gadget (g_ether)
-# ... or on host side, usbnet and random hwaddr
-iface usb0 inet static
-        address 192.168.7.2
-        netmask 255.255.255.0
-        network 192.168.7.0
-        gateway 192.168.7.1
-# Bluetooth networking
-iface bnep0 inet dhcp
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..5de3852 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -35,19 +35,23 @@ 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 \
+    file://Print-pull-progress-also-when-not-on-console.patch \
+    file://Workaround-the-SIGCHLD-handler-issue.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 +72,9 @@ EXTRA_OECONF = "--with-dracut \
                --enable-gtk-doc-html=no \
                --enable-man=no \
                --with-soup \
+                --with-static-prepare-root \
+                --disable-otmpfile \
+                --enable-introspection=no \
                --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/Print-pull-progress-also-when-not-on-console.patch b/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
new file mode 100644
index 0000000..f8e7324
--- /dev/null
+++ b/recipes/ostree/ostree/Print-pull-progress-also-when-not-on-console.patch
@@ -0,0 +1,94 @@
+From b24d691d968bca608142882b453e98ed5ee267e9 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Thu, 29 Sep 2016 11:46:59 +0200
+Subject: [PATCH] Print pull progress also when not on console
+glnx_console_text is smart enough:
+"On a tty, print to the console @text followed by an ASCII art
+ progress bar whose percentage is @percentage.  If stdout is not a
+ tty, a more basic line by line change will be printed."
+Otherwise, when pulling a lot of data, we do not get any feedback
+in a GUI application for a significant amount of time.
+---
+ src/ostree/ot-admin-builtin-switch.c  |  3 +--
+ src/ostree/ot-admin-builtin-upgrade.c |  3 +--
+ src/ostree/ot-builtin-pull-local.c    |  3 +--
+ src/ostree/ot-builtin-pull.c          | 12 ++++--------
+ 4 files changed, 7 insertions(+), 14 deletions(-)
+diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
+index 895538a..7f1d6dd 100644
+--- a/src/ostree/ot-admin-builtin-switch.c
+++ b/src/ostree/ot-admin-builtin-switch.c
+@@ -126,8 +126,7 @@ ot_admin_builtin_switch (int argc, char **argv, GCancellable *cancellable, GErro
+   { g_auto(GLnxConsoleRef) console = { 0, };
+     glnx_console_lock (&console);
+ 
+-    if (console.is_tty)
+-      progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+    progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+ 
+     /* Always allow older...there's not going to be a chronological
+      * relationship necessarily.
+diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
+index 81f9bb6..8147b4f 100644
+--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
+@@ -109,8 +109,7 @@ ot_admin_builtin_upgrade (int argc, char **argv, GCancellable *cancellable, GErr
+   { g_auto(GLnxConsoleRef) console = { 0, };
+     glnx_console_lock (&console);
+ 
+-    if (console.is_tty)
+-      progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+    progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+ 
+     if (opt_allow_downgrade)
+       upgraderpullflags |= OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER;
+diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
+index 5401a28..f2f5b21 100644
+--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
+@@ -159,8 +159,7 @@ ostree_builtin_pull_local (int argc, char **argv, GCancellable *cancellable, GEr
+     g_variant_builder_add (&builder, "{s@v}", "depth",
+                            g_variant_new_variant (g_variant_new_int32 (opt_depth)));
+ 
+-    if (console.is_tty)
+-      progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+    progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+ 
+     opts = g_variant_ref_sink (g_variant_builder_end (&builder));
+     if (!ostree_repo_pull_with_options (repo, src_repo_uri, 
+diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
+index 99b2593..78686b3 100644
+--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
+@@ -242,20 +242,16 @@ ostree_builtin_pull (int argc, char **argv, GCancellable *cancellable, GError **
+ 
+     if (!opt_dry_run)
+       {
+-        if (console.is_tty)
+-          progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+        progress = ostree_async_progress_new_and_connect (ostree_repo_pull_default_console_progress_changed, &console);
+       }
+     else
+       {
+         progress = ostree_async_progress_new_and_connect (dry_run_console_progress_changed, NULL);
+       }
+ 
+-    if (console.is_tty)
+-      {
+-        signal_handler_id = g_signal_connect (repo, "gpg-verify-result",
+-                                              G_CALLBACK (gpg_verify_result_cb),
+-                                              &console);
+-      }
+    signal_handler_id = g_signal_connect (repo, "gpg-verify-result",
+                                          G_CALLBACK (gpg_verify_result_cb),
+                                          &console);
+ 
+     if (!ostree_repo_pull_with_options (repo, remote, g_variant_builder_end (&builder),
+                                         progress, cancellable, error))
+-- 
+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/Workaround-the-SIGCHLD-handler-issue.patch b/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
new file mode 100644
index 0000000..ece69b8
--- /dev/null
+++ b/recipes/ostree/ostree/Workaround-the-SIGCHLD-handler-issue.patch
@@ -0,0 +1,54 @@
+From c7cf5cb80c57423e707d87013050c6f9cc6f6d37 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Tue, 18 Oct 2016 12:19:57 +0200
+Subject: [PATCH] Workaround the SIGCHLD handler issue
+REF: https://bugreports.qt.io/browse/QTBUG-56338
+---
+ src/libostree/ostree-bootloader-grub2.c | 30 ++++++++++++++++++++++--------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
+diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
+index f3dc8e1..2c60b80 100644
+--- a/src/libostree/ostree-bootloader-grub2.c
+++ b/src/libostree/ostree-bootloader-grub2.c
+@@ -380,14 +380,28 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+ 
+      Upstream is fixed though.
+   */
+-  proc = g_subprocess_launcher_spawn (launcher, error,
+-                                      grub_exec, "-o",
+-                                      gs_file_get_path_cached (new_config_path),
+-                                      NULL);
+-
+-  if (!g_subprocess_wait_check (proc, cancellable, error))
+-    goto out;
+-
+  //proc = g_subprocess_launcher_spawn (launcher, error,
+  //                                    grub_exec, "-o",
+  //                                    gs_file_get_path_cached (new_config_path),
+  //                                    NULL);
+
+  //if (!g_subprocess_wait_check (proc, cancellable, error))
+  //  goto out;
+  {
+    // REF: https://bugreports.qt.io/browse/QTBUG-56338
+    // We do not use the chroot (grub2_child_setup) code path, so we do not
+    // care about GSubprocessLauncher and the custom envvars passed to it.
+    const char *cmd = glnx_strjoina (grub_exec, " -o ", gs_file_get_path_cached (new_config_path));
+    FILE *fp = popen(cmd, "r");
+    if (!fp) {
+      glnx_set_prefix_error_from_errno (error, "popen (%s)", cmd);
+      goto out;
+    }
+    if (pclose(fp) == -1) {
+      glnx_set_prefix_error_from_errno (error, "pclose (%s)", cmd);
+      goto out;
+    }
+  } 
+   /* Now let's fdatasync() for the new file */
+   { glnx_fd_close int new_config_fd = open (gs_file_get_path_cached (new_config_path), O_RDONLY | O_CLOEXEC);
+     if (new_config_fd < 0)
+-- 
+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/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 2fb2b60..5e3234f 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -33,6 +33,8 @@ LICENSE = "The-Qt-Company-DCLA-2.1"
 inherit nativesdk packagegroup
+MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 python __anonymous() {
    overrides = d.getVar("OVERRIDES", True).split(":")
    if "mingw32" not in overrides:
@@ -48,7 +50,7 @@ RDEPENDS_${PN}_append_linux = "\
    nativesdk-python-modules \
    nativesdk-python-misc \
    nativesdk-perl-modules \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \
    "
 RDEPENDS_${PN}_append_mingw32 = "\
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 55394d6..a4ef517 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -33,42 +33,25 @@ PR = "r0"
 inherit packagegroup
+MACHINE_EXTRA_INSTALL ?= ""
 RDEPENDS_${PN} = "\
        kernel-modules \
-        adbd \
+        linux-firmware \
-        openssh-sftp-server \
-        openssl \
        openssl-misc \
-        libpng \
-        tiff \
-        libxslt \
-        icu \
-        freetype \
-        fontconfig \
-        liberation-fonts \
-        tslib \
-        tslib-calibrate \
-        alsa-utils-amixer \
-        hunspell \
        ca-certificates \
-        linux-firmware \
+        liberation-fonts \
        ttf-devanagari \
        ttf-opensans \
        ttf-dejavu-common \
        ttf-dejavu-sans \
-        dbus-session-init \
        otf-noto \
-        libmysqlclient \
+        dbus-session-init \
-        libpq \
        tzdata \
        tzdata-americas \
        tzdata-asia \
        tzdata-europe \
-        atk \
-        libevent \
-        ostree \
-        dracut \
        connman \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "wayland", "weston weston-examples", "", d)} \
        ${MACHINE_EXTRA_INSTALL} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
index bb11277..b1bec0e 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
@@ -33,6 +33,8 @@ PR = "r0"
 inherit packagegroup
+MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
 RDEPENDS_${PN} = "\
        gstreamer1.0-meta-base \
        gstreamer1.0-meta-video \
@@ -42,4 +44,5 @@ RDEPENDS_${PN} = "\
        gstreamer1.0-plugins-ugly-meta \
        gstreamer1.0-plugins-bad-meta \
        gstreamer1.0-libav \
+        ${MACHINE_GSTREAMER_1_0_PLUGIN} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
deleted file mode 100644
index 31e0cb4..0000000
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ /dev/null
@@ -1,65 +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 = "Target packages for B2Qt on embedded Linux SDK"
-PR = "r0"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-inherit packagegroup
-inherit bluetooth
-RDEPENDS_${PN} += "\
-    packagegroup-core-standalone-sdk-target \
-    base-files \
-    glib-2.0-dev \
-    openssl-dev \
-    libpng-dev \
-    tiff-dev \
-    alsa-dev \
-    dbus-dev \
-    freetype-dev \
-    fontconfig-dev \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer-dev gst-plugins-base-dev", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-dev gstreamer1.0-plugins-base-dev", "", d)} \
-    icu-dev \
-    libxslt-dev \
-    ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-dev", "udev-dev", d)} \
-    tslib-dev \
-    hunspell-dev \
-    libcap-dev \
-    wpa-supplicant-dev \
-    libmysqlclient-dev \
-    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/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 17b278c..82f67b0 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -34,15 +34,19 @@ PR = "r0"
 inherit packagegroup
 RDEPENDS_${PN} = "\
-        ldd \
+        adbd \
+        alsa-utils-amixer \
        binutils \
        binutils-symlinks \
-        i2c-tools \
-        perf \
-        htop \
-        ntp \
        connman-client \
+        htop \
+        i2c-tools \
        iproute2 \
+        ldd \
+        ntp \
+        openssh-sftp-server \
+        perf \
        rsync \
+        tslib-calibrate \
        ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \
        "
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/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
deleted file mode 100644
index ed58b50..0000000
--- a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@qt.io>
-Date: Tue, 21 Jun 2016 15:26:47 +0200
-Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
- mounts too"
-This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
---
- src/core/mount.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/core/mount.c b/src/core/mount.c
-index fda4d65..3944232 100644
--- a/src/core/mount.c
-+++ b/src/core/mount.c
-@@ -337,7 +337,7 @@ static int mount_add_device_links(Mount *m) {
- 
-         assert(m);
- 
-        p = get_mount_parameters(m);
-+        p = get_mount_parameters_fragment(m);
-         if (!p)
-                 return 0;
- 
-- 
-2.7.4
diff --git a/recipes/systemd/systemd/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..1ba27fe 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/recipes/systemd/systemd_%.bbappend
@@ -28,17 +28,16 @@
 ############################################################################
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"
+SRC_URI += " \
+    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() {
-    if [ -n "$(cat ${S}/NEWS | grep "CHANGES WITH 229")" ]; then
-        bbwarn "systemd: The 0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch patch is not required anymore."
-    fi
-}
-addtask do_verify_patch_required after do_fetch before do_configure
diff --git a/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/recipes/x264/x264_git.bbappend b/recipes/x264/x264_git.bbappend
deleted file mode 100644
index 128563a..0000000
--- a/recipes/x264/x264_git.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$
-##
-############################################################################
-# Workaround: at the sha version defined by tibidabo, the x264 recipe
-# defines a nonexisting SRCREV sha.
-SRCREV_tibidabo = "ffc3ad4945da69f3caa2b40e4eed715a9a8d9526"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 2966f85..aa4ba24 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -6,9 +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"/>
  <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
@@ -18,80 +15,60 @@
  <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"
-           revision="9955f170ad32bc8d6915d1dc2b6b19a8181a6363"
+           revision="dc5f0b3004a0b5a9624d6695909f9c6d743429bc"
           path="sources/meta-qt5"/>
  <project name="meta-mingw"
           remote="qtyocto"
           path="sources/meta-mingw"
-           revision="475d9366eb74ef5c10ec398281dce75ceedddf1c"/>
+           revision="4a877547146f32f4540664b0c677d99b33d12bfd"/>
  <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,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,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"
-           path="sources/meta-tibidabo"
-           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"/>
  <project name="nvidia-layer"
           remote="playground"
-           revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
+           revision="7c95fabf8d71617130f71464207dd55c3079facd"
           path="sources/nvidia-layer"
           groups="notdefault,internal"/>
-  <project name="jetson-tk1-pro"
-           remote="playground"
-           revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
-           path="sources/jetson-tk1-pro"
-           groups="notdefault,internal"/>
  <project name="vibrante-t186"
           remote="playground"
-           revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
+           revision="e947e8f412b41ef673714e752a4065dc2f4fb04e"
           path="sources/vibrante-t186"
           groups="notdefault,internal"/>
  <project name="meta-smx6"
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/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/scripts/mount-image.sh
index 0d557ce..434530d 100644..100755
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
+++ b/scripts/mount-image.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 ############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
@@ -27,23 +28,28 @@
 ##
 ############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+set -e
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+if [ $# -ne 1 ]; then
-BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
+    echo "Usage: $0 <image>"
+    echo "Mount the two partitions (boot and rootfs) from the image to current folder"
+    exit 1
+fi
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
+IMAGE=$1
-# Inhibit warnings about files being stripped.
+if [ ! -f "${IMAGE}" ]; then
-INHIBIT_PACKAGE_STRIP = "1"
+    echo "Image '${IMAGE}' not found"
+    exit 1
+fi
-pkg_postinst_${PN}_append() {
+mkdir -p boot
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
+mkdir -p root
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
-}
-RRECOMMENDS_${PN} = "omap3-sgx-modules"
+sudo umount boot root || true
-RRECOMMENDS_${PN}-blitwsegl = ""
-RRECOMMENDS_${PN}-flipwsegl = ""
+OFFSET=$(parted "${IMAGE}" unit B print | grep "^ 1" | awk {'print $2'} | cut -d B -f 1)
-RRECOMMENDS_${PN}-frontwsegl = ""
+sudo mount -o loop,offset=${OFFSET} "${IMAGE}" boot
-RRECOMMENDS_${PN}-linuxfbwsegl = ""
+OFFSET=$(parted "${IMAGE}" unit B print | grep "^ 2" | awk {'print $2'} | cut -d B -f 1)
+sudo mount -o loop,offset=${OFFSET} "${IMAGE}" root
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 5ee1ad0..2f8264b 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"
@@ -65,24 +65,15 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
    smarc-samx6i)
      LAYERSCONF="bblayers.conf.smx6.sample"
    ;;
-    tibidabo)
+    beagleboard|beaglebone|am335x-evm)
-      LAYERSCONF="bblayers.conf.tibidabo.sample"
-    ;;
-    beagleboard|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)
      LAYERSCONF="bblayers.conf.intel.sample"
    ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
-    ;;
    tegra-x1|tegra-t18x)
      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
    ;;
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 96189ea..14d45c8 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,30 +31,16 @@
 set -x
 set -e
-RELEASE=5.7
+RELEASE=5.8
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
+UPLOADS="\
+    tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
+    tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \
+    tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \
+    "
-if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then
+for f in ${UPLOADS}; do
-  7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
+    if [ -e ${f} ]; then
-    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd
+        rsync -L ${f} ${UPLOADPATH}/
-elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img ]; then
+    fi
-  7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
+done
-    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
-    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \
-    && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
-  7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
-    $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
-    $PWD/tmp/deploy/images/${MACHINE}/*Image
-fi
-if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then
-  rsync b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ${UPLOADPATH}/
-fi
-if [ -e tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh ]; then
-  rsync tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh ${UPLOADPATH}/
-fi
-if [ -e tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z ]; then
-  rsync tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z ${UPLOADPATH}/
-fi