Revert "BBB: use new kernel"

This reverts commit 2848919526f575d9eaaccf19d4bfaa4a0f4043c2.
New kernel is missing cape manager and HDMI output does not work.

Change-Id: I5acf277c8ec96cec253a1c9cd2cbfef547baf81e
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

2 files changed, 57 insertions, 4 deletions

diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
new file mode 100644
index 0000000..2fc1501
--- /dev/null
+++ b/conf/bblayers.conf.bbb.sample
@@ -0,0 +1,50 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-yocto \
+  ${BSPDIR}/sources/meta-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-b2qt \
+  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-b2qt/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/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 1627f37..8a2c3e2 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -34,14 +34,17 @@ EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
 
 DISTRO_FEATURES_remove = "webengine"
 
-PREFERRED_VERSION_linux-ti-staging = "3.14%"
-
-PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
-PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
+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"
+EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
+UBOOT_MACHINE = "am335x_boneblack_config"
+KERNEL_IMAGETYPE = "zImage"
+
 MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
         libgles-omap3-rawdemos \