5 files changed, 106 insertions, 0 deletions

diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
index 49f8f58..ee30872 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
@@ -25,3 +25,7 @@ SRC_URI += "\
     "
 KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
 KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
+
+KERNEL_GIT_URI = "git://github.com/beagleboard/linux"
+BRANCH = "3.14"
+SRCREV = "b36a2d5ca4e2859c92fac09ccedf4e42d620dda7"
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch
new file mode 100644
index 0000000..6b0b4c7
--- /dev/null
+++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Rename-omap_dss_device-output-to-src.patch
@@ -0,0 +1,25 @@
+From 643c4eb9f6e09f3b674990285da7fb1174d6f450 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Thu, 17 Mar 2016 11:58:40 +0200
+Subject: [PATCH] Rename omap_dss_device output to src
+
+---
+ services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c b/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
+index 17bf181..ebacc51 100644
+--- a/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
++++ b/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
+@@ -177,7 +177,7 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
+ #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
+ #else
+-#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL
++#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL
+ #endif
+ 
+ #define        WAIT_FOR_VSYNC(man)     ((man)->wait_for_vsync)
+-- 
+1.9.1
+
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend
new file mode 100644
index 0000000..0fad030
--- /dev/null
+++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_5.01.01.02.bbappend
@@ -0,0 +1,23 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0001-Rename-omap_dss_device-output-to-src.patch"
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb
new file mode 100644
index 0000000..5695561
--- /dev/null
+++ b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script.bb
@@ -0,0 +1,48 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DESCRIPTION = "U-Boot script to start up BeagleBone Black"
+LICENSE = "CLOSED"
+PR = "r0"
+
+COMPATIBLE_MACHINE = "(beaglebone)"
+PV = "20140225"
+
+SRC_URI = "file://uEnv.txt"
+
+inherit deploy
+
+do_deploy () {
+    install -d ${DEPLOYDIR}
+    install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt
+
+    cd ${DEPLOYDIR}
+    rm -f uEnv-${MACHINE}.txt
+    ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt
+}
+
+addtask deploy after do_install before do_build
+
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
new file mode 100644
index 0000000..d41ef60
--- /dev/null
+++ b/meta-ti-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
@@ -0,0 +1,6 @@
+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}