From 01603689e8dd2d3c5be0f41d41b3543452903f03 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 23 Sep 2014 13:04:47 +0300
Subject: Move meta-fsl-arm specific files to separate layer

Create new layer for recipes and files that required only when
meta-fsl-arm and meta-fsl-arm-extra layers are used. For now,
the bblayers.conf template still includes the new layer as well.

Change-Id: I01a0019ebaea3e1532f106e076f7608fb7aa86c6
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
---
 conf/bblayers.conf.sample                          |   1 +
 meta-fsl-extras/conf/layer.conf                    |  33 +++
 .../amd-gpu-x11-bin-mx51_11.09.01.bbappend         |  24 ++
 .../recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc  | 246 +++++++++++++++++++++
 .../0001-change-header-path-to-HAL.patch           |  30 +++
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc       |  12 +
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc   |  12 +
 .../fix-conflicting-TLS-definition.patch           |  31 +++
 .../gc_hal_eglplatform-remove-xlib-undefs.patch    |  34 +++
 .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc        |  10 +
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc |  12 +
 .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc              |  12 +
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc    |  12 +
 .../gpu-viv-bin-mx6q/glesv2_x11.pc                 |  12 +
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc        |  12 +
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc    |  12 +
 .../gpu-viv-bin-mx6q/wayland-egl.pc                |  10 +
 .../gpu-viv-bin-mx6q/wayland-viv.pc                |  10 +
 .../gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend    |   1 +
 .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb           |  11 +
 .../recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb        |  10 +
 .../recipes/linux/linux-boundary_3.10.17.bbappend  |  42 ++++
 .../recipes/linux/linux-imx_3.10.17.bbappend       |  35 +++
 ...001-Updated-kernel-arguments-for-sabre-sd.patch | 133 +++++++++++
 .../recipes/u-boot/u-boot-fslc_2014.01.bbappend    |  26 +++
 ...itrogen6x-disable-console-cursor-blinking.patch |  25 +++
 .../0002-nitrogen6x-update.patch                   |  81 +++++++
 .../u-boot/u-boot-script-boundary_git.bbappend     |  27 +++
 .../amd-gpu-x11-bin-mx51_11.09.01.bbappend         |  24 --
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc      | 246 ---------------------
 .../0001-change-header-path-to-HAL.patch           |  30 ---
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc   |  12 -
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc   |  12 -
 .../fix-conflicting-TLS-definition.patch           |  31 ---
 .../gc_hal_eglplatform-remove-xlib-undefs.patch    |  34 ---
 .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc        |  10 -
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc |  12 -
 .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc              |  12 -
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc    |  12 -
 .../gpu-viv-bin-mx6q/glesv2_x11.pc                 |  12 -
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc    |  12 -
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc    |  12 -
 .../gpu-viv-bin-mx6q/wayland-egl.pc                |  10 -
 .../gpu-viv-bin-mx6q/wayland-viv.pc                |  10 -
 .../gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend    |   1 -
 .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb           |  11 -
 recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb            |  10 -
 recipes/linux/linux-boundary_3.10.17.bbappend      |  42 ----
 recipes/linux/linux-imx_3.10.17.bbappend           |  35 ---
 ...001-Updated-kernel-arguments-for-sabre-sd.patch | 133 -----------
 recipes/u-boot/u-boot-fslc_2014.01.bbappend        |  26 ---
 ...itrogen6x-disable-console-cursor-blinking.patch |  25 ---
 .../0002-nitrogen6x-update.patch                   |  81 -------
 recipes/u-boot/u-boot-script-boundary_git.bbappend |  27 ---
 54 files changed, 916 insertions(+), 882 deletions(-)
 create mode 100644 meta-fsl-extras/conf/layer.conf
 create mode 100644 meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
 create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
 create mode 100644 meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
 create mode 100644 meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
 create mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend
 create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
 create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
 create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
 create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
 create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
 delete mode 100644 recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
 delete mode 100644 recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
 delete mode 100644 recipes/linux/linux-boundary_3.10.17.bbappend
 delete mode 100644 recipes/linux/linux-imx_3.10.17.bbappend
 delete mode 100644 recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
 delete mode 100644 recipes/u-boot/u-boot-fslc_2014.01.bbappend
 delete mode 100644 recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
 delete mode 100644 recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
 delete mode 100644 recipes/u-boot/u-boot-script-boundary_git.bbappend

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index cade58e..9d5c3e5 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -39,6 +39,7 @@ BBLAYERS ?= " \
   ##COREBASE##/meta-openembedded/meta-oe \
   ##COREBASE##/meta-b2qt \
   ##COREBASE##/meta-b2qt/meta-ti-extras \
+  ##COREBASE##/meta-b2qt/meta-fsl-extras \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##COREBASE##/meta \
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
new file mode 100644
index 0000000..5e8676d
--- /dev/null
+++ b/meta-fsl-extras/conf/layer.conf
@@ -0,0 +1,33 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_fsl"
+BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_fsl = "20"
diff --git a/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
new file mode 100644
index 0000000..40075c0
--- /dev/null
+++ b/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# dependency to x11 only when distro features have it
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
new file mode 100644
index 0000000..f661539
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -0,0 +1,246 @@
+# 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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
new file mode 100644
index 0000000..dc91d7c
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
@@ -0,0 +1,30 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000..a21922d
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
new file mode 100644
index 0000000..5921583
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
new file mode 100644
index 0000000..3eac116
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
@@ -0,0 +1,31 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
new file mode 100644
index 0000000..732a073
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
@@ -0,0 +1,34 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
new file mode 100644
index 0000000..f4610ea
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
@@ -0,0 +1,10 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
new file mode 100644
index 0000000..d97b067
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
new file mode 100644
index 0000000..e801633
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000..9be46f2
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
new file mode 100644
index 0000000..57ad807
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
new file mode 100644
index 0000000..7c00def
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
new file mode 100644
index 0000000..94fb91e
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
@@ -0,0 +1,12 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
new file mode 100644
index 0000000..ba1b898
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
@@ -0,0 +1,10 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
new file mode 100644
index 0000000..3fdedd0
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
@@ -0,0 +1,10 @@
+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-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
new file mode 100644
index 0000000..bed361e
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
@@ -0,0 +1 @@
+RDEPENDS_libgl-mx6-dev = ""
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
new file mode 100644
index 0000000..5c7727b
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
@@ -0,0 +1,11 @@
+# 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"
+
+RDEPENDS_libgl-mx6-dev = ""
diff --git a/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
new file mode 100644
index 0000000..f2a736a
--- /dev/null
+++ b/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
@@ -0,0 +1,10 @@
+# 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-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
new file mode 100644
index 0000000..da33ff5
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -0,0 +1,42 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
+
+do_configure_prepend() {
+	# Use multitouch protocol for touchscreen that support it
+	echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+
+	# FunctionFS for adb
+	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+
+	# fix imx-vpu break on video decoding
+	echo "CONFIG_VMSPLIT_2G=y"              >> ${WORKDIR}/defconfig
+}
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend
new file mode 100644
index 0000000..df01b62
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend
@@ -0,0 +1,35 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# kernel image files are not needed in the image
+RDEPENDS_kernel-base = ""
+
+do_configure_prepend() {
+	# FunctionFS for adb
+	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
new file mode 100644
index 0000000..59a4505
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
+From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 9 May 2014 10:23:50 +0300
+Subject: [PATCH] Updated kernel arguments for sabre sd
+
+- Enable I2C
+- detect if hdmi is used and change video arguments accordingly
+- disable blanking and cursor blinking
+
+---
+ board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
+ include/configs/mx6sabre_common.h       | 21 +++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
+index 12d8c56..303b774 100644
+--- a/board/freescale/mx6sabresd/mx6sabresd.c
++++ b/board/freescale/mx6sabresd/mx6sabresd.c
+@@ -12,6 +12,7 @@
+ #include <asm/arch/mx6-pins.h>
+ #include <asm/errno.h>
+ #include <asm/gpio.h>
++#include <asm/imx-common/mxc_i2c.h>
+ #include <asm/imx-common/iomux-v3.h>
+ #include <asm/imx-common/boot_mode.h>
+ #include <mmc.h>
+@@ -24,6 +25,7 @@
+ #include <ipu_pixfmt.h>
+ #include <asm/io.h>
+ #include <asm/arch/sys_proto.h>
++#include <i2c.h>
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+ #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
+@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
+ 		      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
+ 
++#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
++	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\
++	PAD_CTL_ODE | PAD_CTL_SRE_FAST)
++
++#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
++
+ int dram_init(void)
+ {
+ 	gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
+ 	MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
++static struct i2c_pads_info i2c_pad_info1 = {
++	.scl = {
++		.i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
++		.gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
++		.gp = IMX_GPIO_NR(4, 12)
++	},
++	.sda = {
++		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
++		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
++		.gp = IMX_GPIO_NR(4, 13)
++	}
++};
++
+ static void setup_spi(void)
+ {
+ 	imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
+@@ -477,6 +498,8 @@ int board_init(void)
+ 	setup_spi();
+ #endif
+ 
++	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
++
+ 	return 0;
+ }
+ 
+diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
+index 5ee7fa5..b83bf74 100644
+--- a/include/configs/mx6sabre_common.h
++++ b/include/configs/mx6sabre_common.h
+@@ -85,6 +85,13 @@
+ /* Command definition */
+ #include <config_cmd_default.h>
+ 
++/* I2C Configs */
++#define CONFIG_CMD_I2C
++#define CONFIG_SYS_I2C
++#define CONFIG_SYS_I2C_MXC
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_I2C_EDID
++
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_BOOTZ
+ #define CONFIG_CMD_SETEXPR
+@@ -117,6 +124,15 @@
+ #define EMMC_ENV ""
+ #endif
+ 
++#define VIDEOARGS \
++	"videoargs=" \
++	"i2c dev 1 ; " \
++	"if i2c probe 0x50 ; then " \
++		"setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
++	"else " \
++		"setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
++	"fi\0"
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"script=boot.scr\0" \
+ 	"uimage=uImage\0" \
+@@ -144,7 +160,11 @@
+ 			"fi; "	\
+ 		"fi\0" \
+ 	EMMC_ENV	  \
++	VIDEOARGS \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
++		"video=${video} "\
++		"consoleblank=0 " \
++		"vt.global_cursor_default=0 " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+ 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+@@ -153,6 +173,7 @@
+ 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ 	"mmcboot=echo Booting from mmc ...; " \
++		"run videoargs; " \
+ 		"run mmcargs; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ 			"if run loadfdt; then " \
+-- 
+1.8.3.2
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
new file mode 100644
index 0000000..b4ff56f
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
+        "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
new file mode 100644
index 0000000..d97921c
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
@@ -0,0 +1,25 @@
+From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 10 Jan 2014 12:37:20 +0200
+Subject: [PATCH] nitrogen6x: disable console cursor blinking
+
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+index d933fa0..2d7c575 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
+ done
+ 
+ setenv bootargs $bootargs $fbmem
+-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
++setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
+ 
+ if itest.s x$bootpart == x ; then
+ 	bootpart=1
+-- 
+1.7.10.4
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
new file mode 100644
index 0000000..995e418
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
@@ -0,0 +1,81 @@
+From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001
+From: Rainer Keller <rainer.keller@digia.com>
+Date: Fri, 5 Sep 2014 14:39:50 +0200
+Subject: [PATCH] Add support for update recovery linux
+
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+index 5bc6170..4116ed4 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+@@ -1,3 +1,64 @@
++# Boot2Qt update part begin
++echo "Boot to Qt"
++if test "x$boot2qt_update_state" = "x" ; then
++  setenv boot2qt_update_state valid
++  saveenv
++fi
++
++# This is a workaround because environment partition is read-only.
++if fatload mmc 1:1 0x12000000 update/state ; then
++    mw.b 0x13000000 0x76 1 # v
++    mw.b 0x13000001 0x75 1 # u
++    mw.b 0x13000002 0x74 1 # t
++
++    if cmp.b 0x12000000 0x13000000 1 ; then
++        echo "State: Valid"
++        setenv boot2qt_fat_state valid
++        setenv boot2qt_update_state valid
++        saveenv
++    fi
++    if cmp.b 0x12000000 0x13000001 1 ; then
++        echo "State: Update"
++        setenv boot2qt_fat_state update
++    fi
++    if cmp.b 0x12000000 0x13000002 1 ; then
++        echo "State: Testing"
++        setenv boot2qt_fat_state testing
++    fi
++fi
++
++if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then
++  setenv boot2qt_update_state testing
++  saveenv
++  echo "Recovery linux starting..."
++  setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0"
++
++  # Guess dtb name
++  dtbname="imx6";
++  if itest.s x6S != "x\$cpu" ; then
++    dtbname=\${dtbname}q-;
++  else
++    dtbname=\${dtbname}s-;
++  fi
++
++  if itest.s x == "x\$board" ; then
++    board=sabrelite
++  fi
++  dtbname=\${dtbname}\${board}.dtb;
++
++  fatload mmc 1:1 0x10800000 update/uImage
++  fatload mmc 1:1 0x12000000 update/${dtbname}
++  fatload mmc 1:1 0x13000000 update/uRamdisk
++  bootm 0x10800000 0x13000000 0x12000000
++fi
++
++if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then
++  setenv boot2qt_update_state invalid
++  saveenv
++fi
++
++# Boot2Qt update part end
++
+ # Yocto-specifics
+ setenv bootpart 2
+ setenv bootdir /
+-- 
+1.8.5.5
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
new file mode 100644
index 0000000..a479c2b
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -0,0 +1,27 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-nitrogen6x-disable-console-cursor-blinking.patch \
+        file://0002-nitrogen6x-update.patch \
+        "
diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
deleted file mode 100644
index 40075c0..0000000
--- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# dependency to x11 only when distro features have it
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
deleted file mode 100644
index f661539..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
deleted file mode 100644
index dc91d7c..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
deleted file mode 100644
index a21922d..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
deleted file mode 100644
index 5921583..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
deleted file mode 100644
index 3eac116..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
deleted file mode 100644
index 732a073..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
deleted file mode 100644
index f4610ea..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
deleted file mode 100644
index d97b067..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
deleted file mode 100644
index e801633..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
deleted file mode 100644
index 9be46f2..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
deleted file mode 100644
index 57ad807..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
deleted file mode 100644
index 7c00def..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
deleted file mode 100644
index 94fb91e..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
deleted file mode 100644
index ba1b898..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
deleted file mode 100644
index 3fdedd0..0000000
--- a/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/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
deleted file mode 100644
index bed361e..0000000
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_libgl-mx6-dev = ""
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
deleted file mode 100644
index 5c7727b..0000000
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
+++ /dev/null
@@ -1,11 +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"
-
-RDEPENDS_libgl-mx6-dev = ""
diff --git a/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
deleted file mode 100644
index f2a736a..0000000
--- a/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/recipes/linux/linux-boundary_3.10.17.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend
deleted file mode 100644
index da33ff5..0000000
--- a/recipes/linux/linux-boundary_3.10.17.bbappend
+++ /dev/null
@@ -1,42 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
-
-do_configure_prepend() {
-	# Use multitouch protocol for touchscreen that support it
-	echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-	echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-
-	# FunctionFS for adb
-	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-
-	# Enable USB serial support
-	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-
-	# fix imx-vpu break on video decoding
-	echo "CONFIG_VMSPLIT_2G=y"              >> ${WORKDIR}/defconfig
-}
diff --git a/recipes/linux/linux-imx_3.10.17.bbappend b/recipes/linux/linux-imx_3.10.17.bbappend
deleted file mode 100644
index df01b62..0000000
--- a/recipes/linux/linux-imx_3.10.17.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# kernel image files are not needed in the image
-RDEPENDS_kernel-base = ""
-
-do_configure_prepend() {
-	# FunctionFS for adb
-	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-
-	# Enable USB serial support
-	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-}
diff --git a/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
deleted file mode 100644
index 59a4505..0000000
--- a/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Fri, 9 May 2014 10:23:50 +0300
-Subject: [PATCH] Updated kernel arguments for sabre sd
-
-- Enable I2C
-- detect if hdmi is used and change video arguments accordingly
-- disable blanking and cursor blinking
-
----
- board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
- include/configs/mx6sabre_common.h       | 21 +++++++++++++++++++++
- 2 files changed, 44 insertions(+)
-
-diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
-index 12d8c56..303b774 100644
---- a/board/freescale/mx6sabresd/mx6sabresd.c
-+++ b/board/freescale/mx6sabresd/mx6sabresd.c
-@@ -12,6 +12,7 @@
- #include <asm/arch/mx6-pins.h>
- #include <asm/errno.h>
- #include <asm/gpio.h>
-+#include <asm/imx-common/mxc_i2c.h>
- #include <asm/imx-common/iomux-v3.h>
- #include <asm/imx-common/boot_mode.h>
- #include <mmc.h>
-@@ -24,6 +25,7 @@
- #include <ipu_pixfmt.h>
- #include <asm/io.h>
- #include <asm/arch/sys_proto.h>
-+#include <i2c.h>
- DECLARE_GLOBAL_DATA_PTR;
- 
- #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
- #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
- 		      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
- 
-+#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-+	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\
-+	PAD_CTL_ODE | PAD_CTL_SRE_FAST)
-+
-+#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
-+
- int dram_init(void)
- {
- 	gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
-@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
- 	MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
- };
- 
-+static struct i2c_pads_info i2c_pad_info1 = {
-+	.scl = {
-+		.i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
-+		.gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
-+		.gp = IMX_GPIO_NR(4, 12)
-+	},
-+	.sda = {
-+		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
-+		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
-+		.gp = IMX_GPIO_NR(4, 13)
-+	}
-+};
-+
- static void setup_spi(void)
- {
- 	imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
-@@ -477,6 +498,8 @@ int board_init(void)
- 	setup_spi();
- #endif
- 
-+	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-+
- 	return 0;
- }
- 
-diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index 5ee7fa5..b83bf74 100644
---- a/include/configs/mx6sabre_common.h
-+++ b/include/configs/mx6sabre_common.h
-@@ -85,6 +85,13 @@
- /* Command definition */
- #include <config_cmd_default.h>
- 
-+/* I2C Configs */
-+#define CONFIG_CMD_I2C
-+#define CONFIG_SYS_I2C
-+#define CONFIG_SYS_I2C_MXC
-+#define CONFIG_SYS_I2C_SPEED		100000
-+#define CONFIG_I2C_EDID
-+
- #define CONFIG_CMD_BMODE
- #define CONFIG_CMD_BOOTZ
- #define CONFIG_CMD_SETEXPR
-@@ -117,6 +124,15 @@
- #define EMMC_ENV ""
- #endif
- 
-+#define VIDEOARGS \
-+	"videoargs=" \
-+	"i2c dev 1 ; " \
-+	"if i2c probe 0x50 ; then " \
-+		"setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
-+	"else " \
-+		"setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
-+	"fi\0"
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	"script=boot.scr\0" \
- 	"uimage=uImage\0" \
-@@ -144,7 +160,11 @@
- 			"fi; "	\
- 		"fi\0" \
- 	EMMC_ENV	  \
-+	VIDEOARGS \
- 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-+		"video=${video} "\
-+		"consoleblank=0 " \
-+		"vt.global_cursor_default=0 " \
- 		"root=${mmcroot}\0" \
- 	"loadbootscript=" \
- 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-@@ -153,6 +173,7 @@
- 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
- 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- 	"mmcboot=echo Booting from mmc ...; " \
-+		"run videoargs; " \
- 		"run mmcargs; " \
- 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- 			"if run loadfdt; then " \
--- 
-1.8.3.2
-
diff --git a/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
deleted file mode 100644
index b4ff56f..0000000
--- a/recipes/u-boot/u-boot-fslc_2014.01.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
-        "
diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
deleted file mode 100644
index d97921c..0000000
--- a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Fri, 10 Jan 2014 12:37:20 +0200
-Subject: [PATCH] nitrogen6x: disable console cursor blinking
-
----
- board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-index d933fa0..2d7c575 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
- done
- 
- setenv bootargs $bootargs $fbmem
--setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
-+setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
- 
- if itest.s x$bootpart == x ; then
- 	bootpart=1
--- 
-1.7.10.4
-
diff --git a/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
deleted file mode 100644
index 995e418..0000000
--- a/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001
-From: Rainer Keller <rainer.keller@digia.com>
-Date: Fri, 5 Sep 2014 14:39:50 +0200
-Subject: [PATCH] Add support for update recovery linux
-
----
- board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-index 5bc6170..4116ed4 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-@@ -1,3 +1,64 @@
-+# Boot2Qt update part begin
-+echo "Boot to Qt"
-+if test "x$boot2qt_update_state" = "x" ; then
-+  setenv boot2qt_update_state valid
-+  saveenv
-+fi
-+
-+# This is a workaround because environment partition is read-only.
-+if fatload mmc 1:1 0x12000000 update/state ; then
-+    mw.b 0x13000000 0x76 1 # v
-+    mw.b 0x13000001 0x75 1 # u
-+    mw.b 0x13000002 0x74 1 # t
-+
-+    if cmp.b 0x12000000 0x13000000 1 ; then
-+        echo "State: Valid"
-+        setenv boot2qt_fat_state valid
-+        setenv boot2qt_update_state valid
-+        saveenv
-+    fi
-+    if cmp.b 0x12000000 0x13000001 1 ; then
-+        echo "State: Update"
-+        setenv boot2qt_fat_state update
-+    fi
-+    if cmp.b 0x12000000 0x13000002 1 ; then
-+        echo "State: Testing"
-+        setenv boot2qt_fat_state testing
-+    fi
-+fi
-+
-+if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then
-+  setenv boot2qt_update_state testing
-+  saveenv
-+  echo "Recovery linux starting..."
-+  setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0"
-+
-+  # Guess dtb name
-+  dtbname="imx6";
-+  if itest.s x6S != "x\$cpu" ; then
-+    dtbname=\${dtbname}q-;
-+  else
-+    dtbname=\${dtbname}s-;
-+  fi
-+
-+  if itest.s x == "x\$board" ; then
-+    board=sabrelite
-+  fi
-+  dtbname=\${dtbname}\${board}.dtb;
-+
-+  fatload mmc 1:1 0x10800000 update/uImage
-+  fatload mmc 1:1 0x12000000 update/${dtbname}
-+  fatload mmc 1:1 0x13000000 update/uRamdisk
-+  bootm 0x10800000 0x13000000 0x12000000
-+fi
-+
-+if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then
-+  setenv boot2qt_update_state invalid
-+  saveenv
-+fi
-+
-+# Boot2Qt update part end
-+
- # Yocto-specifics
- setenv bootpart 2
- setenv bootdir /
--- 
-1.8.5.5
-
diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend
deleted file mode 100644
index a479c2b..0000000
--- a/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ /dev/null
@@ -1,27 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-nitrogen6x-disable-console-cursor-blinking.patch \
-        file://0002-nitrogen6x-update.patch \
-        "
-- 
cgit v1.2.3-54-g00ecf