summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-02 11:58:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-12 12:34:57 +0000
commitc23246d7bfeec65dc69eb381adc38916df486ad2 (patch)
tree4d945e4274eae3089b57b2e0cf5f0fc5c8b374d0
parent0ae680c6463b82dfcd4a7692eb35dc4a9456b2f7 (diff)
downloadmeta-boot2qt-c23246d7bfeec65dc69eb381adc38916df486ad2.tar.gz
TI: Use latest versions of u-boot and kernel
Remove use of meta-beagleboard and use recipes provided in meta-ti instead. Beaglebone will not work fully with the linux-ti-staging, follow up commit will fix that. U-boot changes need to be ported to newer version if still required. Change-Id: I3e06b6e310c0d40b9b4b33276802e4817cee0295 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat
-rwxr-xr-xb2qt-init-build-env5
-rw-r--r--conf/bblayers.conf.bbb.sample54
-rw-r--r--conf/bblayers.conf.sample11
-rw-r--r--conf/distro/include/am335x-evm.conf15
-rw-r--r--conf/distro/include/beaglebone.conf25
-rw-r--r--conf/distro/include/ti.inc13
-rw-r--r--meta-beagleboard-extras/conf/layer.conf40
-rwxr-xr-xmeta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch34
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch52
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch133
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch99
-rwxr-xr-xmeta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch121
-rwxr-xr-xmeta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch97
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff128
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch163
-rw-r--r--meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend52
-rw-r--r--meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb57
-rw-r--r--meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt6
-rwxr-xr-xmeta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr117
-rw-r--r--meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend50
-rw-r--r--meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb55
-rw-r--r--meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend49
-rw-r--r--meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend (renamed from meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend)1
-rw-r--r--meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch32
-rw-r--r--meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch51
-rw-r--r--meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch63
-rw-r--r--meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb66
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch25
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend33
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch25
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend33
-rw-r--r--scripts/manifest.xml10
-rwxr-xr-xscripts/setup-environment.sh5
33 files changed, 25 insertions, 1695 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index a1f0efb..56aeb1a 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -118,12 +118,9 @@ get_groups() {
118 tibidabo) 118 tibidabo)
119 PROJECT_GROUPS="architech" 119 PROJECT_GROUPS="architech"
120 ;; 120 ;;
121 beagleboard|am335x-evm) 121 beagleboard|beaglebone|am335x-evm)
122 PROJECT_GROUPS="ti" 122 PROJECT_GROUPS="ti"
123 ;; 123 ;;
124 beaglebone)
125 PROJECT_GROUPS="bbb"
126 ;;
127 raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3) 124 raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
128 PROJECT_GROUPS="rpi" 125 PROJECT_GROUPS="rpi"
129 ;; 126 ;;
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
deleted file mode 100644
index 2a3ce11..0000000
--- a/conf/bblayers.conf.bbb.sample
+++ /dev/null
@@ -1,54 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly
32POKY_BBLAYERS_CONF_VERSION = "2"
33
34BBPATH = "${TOPDIR}"
35BBFILES ?= ""
36BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
37
38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
42 ${BSPDIR}/sources/meta-ti \
43 ${BSPDIR}/sources/meta-fsl-arm \
44 ${BSPDIR}/sources/meta-openembedded/meta-oe \
45 ${BSPDIR}/sources/meta-openembedded/meta-python \
46 ${BSPDIR}/sources/meta-openembedded/meta-networking \
47 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
48 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
49 ${BSPDIR}/sources/meta-boot2qt \
50 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \
54 "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 95b4e3f..381c488 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -38,17 +38,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-poky \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
44 ${BSPDIR}/sources/meta-ti \
45 ${BSPDIR}/sources/meta-raspberrypi \
46 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 41 ${BSPDIR}/sources/meta-openembedded/meta-oe \
42 ${BSPDIR}/sources/meta-openembedded/meta-python \
43 ${BSPDIR}/sources/meta-openembedded/meta-networking \
44 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
47 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ 45 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
48 ${BSPDIR}/sources/meta-boot2qt \ 46 ${BSPDIR}/sources/meta-boot2qt \
49 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
50 ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
52 ${BSPDIR}/sources/meta-mingw \ 47 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \ 48 ${BSPDIR}/sources/meta-qt5 \
54 " 49 "
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 12f8a57..cc4f573 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -39,20 +39,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
39 39
40DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
41 41
42PREFERRED_VERSION_linux-ti-staging = "3.14%" 42MACHINE_EXTRA_INSTALL += "\
43
44PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
45PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
46
47PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
48PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
49
50MACHINE_EXTRA_INSTALL = "\
51 libgles-omap3 \
52 libgles-omap3-rawdemos \
53 lighttpd \ 43 lighttpd \
54 " 44 "
55 45
56MACHINE_EXTRA_INSTALL_SDK = "\ 46MACHINE_EXTRA_INSTALL_SDK += "\
57 libgles-omap3-dev \
58 " 47 "
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index da4ed1c..372626f 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -34,34 +34,15 @@ DEPLOY_CONF_NAME = "BeagleBone Black"
34BOOTFS_CONTENT = "\ 34BOOTFS_CONTENT = "\
35 u-boot-${MACHINE}.img:u-boot.img \ 35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \ 36 MLO-${MACHINE}:MLO \
37 uEnv-${MACHINE}.txt:uEnv.txt \
38 " 37 "
39BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" 38BOOTFS_DEPENDS = "u-boot:do_deploy"
40
41EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
42 39
43DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
44 41
45PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" 42MACHINE_EXTRA_INSTALL += "\
46PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
47
48PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
49PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
50
51PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
52EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
53UBOOT_MACHINE = "am335x_boneblack_config"
54KERNEL_IMAGETYPE = "zImage"
55
56MACHINE_EXTRA_INSTALL = "\
57 libgles-omap3 \
58 libgles-omap3-rawdemos \
59 " 43 "
60 44
61MACHINE_EXTRA_INSTALL_SDK = "\ 45MACHINE_EXTRA_INSTALL_SDK += "\
62 libgles-omap3-dev \
63 " 46 "
64 47
65ADB_PRODUCTID = "0xD002" 48ADB_PRODUCTID = "0xD002"
66
67DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 2f0d6cb..a97511a 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -34,3 +34,16 @@ IMAGE_CLASSES += "image_types_fsl"
34 34
35UBOOT_SUFFIX = "img" 35UBOOT_SUFFIX = "img"
36BOOT_SCRIPTS = "${BOOTFS_CONTENT}" 36BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
37
38PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
39PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
40PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
41
42MACHINE_EXTRA_INSTALL += "\
43 ti-sgx-ddk-km \
44 ti-sgx-ddk-um \
45 "
46
47MACHINE_EXTRA_INSTALL_SDK += "\
48 ti-sgx-ddk-um-dev \
49 "
diff --git a/meta-beagleboard-extras/conf/layer.conf b/meta-beagleboard-extras/conf/layer.conf
deleted file mode 100644
index 7307f55..0000000
--- a/meta-beagleboard-extras/conf/layer.conf
+++ /dev/null
@@ -1,40 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30# We have a conf and classes directory, append to BBPATH
31BBPATH .= ":${LAYERDIR}"
32
33# We have a recipes directory, add to BBFILES
34BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
35 ${LAYERDIR}/recipes*/*/*.bbappend \
36 "
37
38BBFILE_COLLECTIONS += "b2qt_bb"
39BBFILE_PATTERN_b2qt_bb := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_bb = "20"
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch
deleted file mode 100755
index 97ce000..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-AM335x-Adding-SGX-DT-node.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 1400fbf3e8e02eb1efd210a892a0d602061c7ca8 Mon Sep 17 00:00:00 2001
2From: Prathap M S <msprathap@ti.com>
3Date: Mon, 2 Sep 2013 11:42:13 +0530
4Subject: [PATCH 1/3] AM335x : Adding SGX DT node
5
6This adds the SGX DT node for AM335x.
7
8Signed-off-by: Prathap M S <msprathap@ti.com>
9---
10 arch/arm/boot/dts/am33xx.dtsi | 8 ++++++++
11 1 files changed, 8 insertions(+), 0 deletions(-)
12
13diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
14index 17e0da8..74c6e41 100644
15--- a/arch/arm/boot/dts/am33xx.dtsi
16+++ b/arch/arm/boot/dts/am33xx.dtsi
17@@ -96,6 +96,14 @@
18 reg = <0x48200000 0x1000>;
19 };
20
21+ sgx@0x56000000 {
22+ compatible = "ti,sgx";
23+ ti,hwmods = "gfx";
24+ clock-frequency = <200000000>;
25+ reg = <0x56000000 0x1000000>;
26+ interrupts = <37>;
27+ };
28+
29 edma: edma@49000000 {
30 compatible = "ti,edma3";
31 ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
32--
331.7.1
34
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
deleted file mode 100644
index ee61a74..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
2From: Behan Webster <behanw@converseincode.com>
3Date: Wed, 24 Sep 2014 01:06:46 +0100
4Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
5
6With compilers which follow the C99 standard (like modern versions of gcc and
7clang), "extern inline" does the wrong thing (emits code for an externally
8linkable version of the inline function). In this case using static inline
9and removing the NULL version of return_address in return_address.c does
10the right thing.
11
12Signed-off-by: Behan Webster <behanw@converseincode.com>
13Reviewed-by: Mark Charlebois <charlebm@gmail.com>
14Acked-by: Steven Rostedt <rostedt@goodmis.org>
15Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16---
17 arch/arm/include/asm/ftrace.h | 2 +-
18 arch/arm/kernel/return_address.c | 5 -----
19 2 files changed, 1 insertion(+), 6 deletions(-)
20
21diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
22index f89515a..2bb8cac 100644
23--- a/arch/arm/include/asm/ftrace.h
24+++ b/arch/arm/include/asm/ftrace.h
25@@ -45,7 +45,7 @@ void *return_address(unsigned int);
26
27 #else
28
29-extern inline void *return_address(unsigned int level)
30+static inline void *return_address(unsigned int level)
31 {
32 return NULL;
33 }
34diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
35index fafedd8..f6aa84d 100644
36--- a/arch/arm/kernel/return_address.c
37+++ b/arch/arm/kernel/return_address.c
38@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
39 #warning "TODO: return_address should use unwind tables"
40 #endif
41
42-void *return_address(unsigned int level)
43-{
44- return NULL;
45-}
46-
47 #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
48
49 EXPORT_SYMBOL_GPL(return_address);
50--
511.9.1
52
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
deleted file mode 100644
index 66f031f..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-Change-extern-inline-to-static-inline.patch
+++ /dev/null
@@ -1,133 +0,0 @@
1From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 13 Apr 2016 15:42:49 +0300
4Subject: [PATCH] Change "extern inline" to "static inline"
5
6With compilers which follow the C99 standard (like modern versions of gcc and
7clang), "extern inline" does the wrong thing (emits code for an externally
8linkable version of the inline function). "static inline" is the correct choice
9instead.
10---
11 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
12 drivers/staging/rtl8712/ieee80211.h | 4 ++--
13 lib/mpi/mpi-inline.h | 2 +-
14 lib/mpi/mpi-internal.h | 16 ++++++++--------
15 4 files changed, 16 insertions(+), 16 deletions(-)
16
17diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
18index 502bfdb..1c8d026 100644
19--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
20+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
21@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
22 return ((struct ieee80211_device *)netdev_priv(dev))->priv;
23 }
24
25-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
26+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
27 {
28 /* Single white space is for Linksys APs */
29 if (essid_len == 1 && essid[0] == ' ')
30@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
31 return 1;
32 }
33
34-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
35+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
36 {
37 /*
38 * It is possible for both access points and our device to support
39@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
40 return 0;
41 }
42
43-extern inline int ieee80211_get_hdrlen(u16 fc)
44+static inline int ieee80211_get_hdrlen(u16 fc)
45 {
46 int hdrlen = IEEE80211_3ADDR_LEN;
47
48@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
49
50 extern const long ieee80211_wlan_frequencies[];
51
52-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
53+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
54 {
55 ieee->scans++;
56 }
57
58-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
59+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
60 {
61 return ieee->scans;
62 }
63diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
64index 21515c3..7518061 100644
65--- a/drivers/staging/rtl8712/ieee80211.h
66+++ b/drivers/staging/rtl8712/ieee80211.h
67@@ -734,7 +734,7 @@ enum ieee80211_state {
68 #define IEEE_G (1<<2)
69 #define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G)
70
71-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
72+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
73 {
74 /* Single white space is for Linksys APs */
75 if (essid_len == 1 && essid[0] == ' ')
76@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
77 return 1;
78 }
79
80-extern inline int ieee80211_get_hdrlen(u16 fc)
81+static inline int ieee80211_get_hdrlen(u16 fc)
82 {
83 int hdrlen = 24;
84
85diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
86index e2b3985..c245ea3 100644
87--- a/lib/mpi/mpi-inline.h
88+++ b/lib/mpi/mpi-inline.h
89@@ -30,7 +30,7 @@
90 #define G10_MPI_INLINE_H
91
92 #ifndef G10_MPI_INLINE_DECL
93-#define G10_MPI_INLINE_DECL extern inline
94+#define G10_MPI_INLINE_DECL static inline
95 #endif
96
97 G10_MPI_INLINE_DECL mpi_limb_t
98diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
99index 77adcf6..4566d11 100644
100--- a/lib/mpi/mpi-internal.h
101+++ b/lib/mpi/mpi-internal.h
102@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
103 int mpi_lshift_limbs(MPI a, unsigned int count);
104
105 /*-- mpihelp-add.c --*/
106-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
107- mpi_size_t s1_size, mpi_limb_t s2_limb);
108+//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
109+// mpi_size_t s1_size, mpi_limb_t s2_limb);
110 mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
111 mpi_ptr_t s2_ptr, mpi_size_t size);
112-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
113- mpi_ptr_t s2_ptr, mpi_size_t s2_size);
114+//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
115+// mpi_ptr_t s2_ptr, mpi_size_t s2_size);
116
117 /*-- mpihelp-sub.c --*/
118-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
119- mpi_size_t s1_size, mpi_limb_t s2_limb);
120+//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
121+// mpi_size_t s1_size, mpi_limb_t s2_limb);
122 mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
123 mpi_ptr_t s2_ptr, mpi_size_t size);
124-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
125- mpi_ptr_t s2_ptr, mpi_size_t s2_size);
126+//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
127+// mpi_ptr_t s2_ptr, mpi_size_t s2_size);
128
129 /*-- mpihelp-cmp.c --*/
130 int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
131--
1321.9.1
133
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
deleted file mode 100644
index 13a89fb..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0001-kernel-add-support-for-gcc-5.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From 376075b9598d602950b73cc78743735585c0a18c Mon Sep 17 00:00:00 2001
2From: Sasha Levin <sasha.levin@oracle.com>
3Date: Mon, 13 Oct 2014 15:51:05 -0700
4Subject: [PATCH] kernel: add support for gcc 5
5
6commit 71458cfc782eafe4b27656e078d379a34e472adf upstream.
7
8We're missing include/linux/compiler-gcc5.h which is required now
9because gcc branched off to v5 in trunk.
10
11Just copy the relevant bits out of include/linux/compiler-gcc4.h,
12no new code is added as of now.
13
14This fixes a build error when using gcc 5.
15
16Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
17Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
18Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
19Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20---
21 include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
22 1 file changed, 66 insertions(+)
23 create mode 100644 include/linux/compiler-gcc5.h
24
25diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
26new file mode 100644
27index 0000000..cdd1cc2
28--- /dev/null
29+++ b/include/linux/compiler-gcc5.h
30@@ -0,0 +1,66 @@
31+#ifndef __LINUX_COMPILER_H
32+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
33+#endif
34+
35+#define __used __attribute__((__used__))
36+#define __must_check __attribute__((warn_unused_result))
37+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
38+
39+/* Mark functions as cold. gcc will assume any path leading to a call
40+ to them will be unlikely. This means a lot of manual unlikely()s
41+ are unnecessary now for any paths leading to the usual suspects
42+ like BUG(), printk(), panic() etc. [but let's keep them for now for
43+ older compilers]
44+
45+ Early snapshots of gcc 4.3 don't support this and we can't detect this
46+ in the preprocessor, but we can live with this because they're unreleased.
47+ Maketime probing would be overkill here.
48+
49+ gcc also has a __attribute__((__hot__)) to move hot functions into
50+ a special section, but I don't see any sense in this right now in
51+ the kernel context */
52+#define __cold __attribute__((__cold__))
53+
54+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
55+
56+#ifndef __CHECKER__
57+# define __compiletime_warning(message) __attribute__((warning(message)))
58+# define __compiletime_error(message) __attribute__((error(message)))
59+#endif /* __CHECKER__ */
60+
61+/*
62+ * Mark a position in code as unreachable. This can be used to
63+ * suppress control flow warnings after asm blocks that transfer
64+ * control elsewhere.
65+ *
66+ * Early snapshots of gcc 4.5 don't support this and we can't detect
67+ * this in the preprocessor, but we can live with this because they're
68+ * unreleased. Really, we need to have autoconf for the kernel.
69+ */
70+#define unreachable() __builtin_unreachable()
71+
72+/* Mark a function definition as prohibited from being cloned. */
73+#define __noclone __attribute__((__noclone__))
74+
75+/*
76+ * Tell the optimizer that something else uses this function or variable.
77+ */
78+#define __visible __attribute__((externally_visible))
79+
80+/*
81+ * GCC 'asm goto' miscompiles certain code sequences:
82+ *
83+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
84+ *
85+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
86+ * Fixed in GCC 4.8.2 and later versions.
87+ *
88+ * (asm goto is automatically volatile - the naming reflects this.)
89+ */
90+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
91+
92+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
93+#define __HAVE_BUILTIN_BSWAP32__
94+#define __HAVE_BUILTIN_BSWAP64__
95+#define __HAVE_BUILTIN_BSWAP16__
96+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
97--
981.9.1
99
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch
deleted file mode 100755
index 05672d3..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch
+++ /dev/null
@@ -1,121 +0,0 @@
1From 4179cd27a2caa23688646e043e2872e89c9a7bc7 Mon Sep 17 00:00:00 2001
2From: Prathap M S <msprathap@ti.com>
3Date: Mon, 2 Sep 2013 11:52:03 +0530
4Subject: [PATCH 2/3] AM33XX : Invoke hwmod deassert for SGX(graphics device)
5
6By default reset is asserted for SGX.
7Adding gpu.c file introducing omap_sgx_init_of() for deasserting SGX reset.
8This calls omap_device_deassert_hardreset() for deasserting the reset for SGX.
9
10Signed-off-by: Prathap M S <msprathap@ti.com>
11---
12 arch/arm/mach-omap2/Makefile | 2 +-
13 arch/arm/mach-omap2/board-generic.c | 4 +++
14 arch/arm/mach-omap2/common.h | 1 +
15 arch/arm/mach-omap2/gpu.c | 48 +++++++++++++++++++++++++++++++++++
16 4 files changed, 54 insertions(+), 1 deletions(-)
17 create mode 100644 arch/arm/mach-omap2/gpu.c
18
19diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
20index d4f6715..b65cc56 100644
21--- a/arch/arm/mach-omap2/Makefile
22+++ b/arch/arm/mach-omap2/Makefile
23@@ -8,7 +8,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
24 # Common support
25 obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
26 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
27- omap_device.o sram.o
28+ omap_device.o sram.o gpu.o
29
30 omap-2-3-common = irq.o
31 hwmod-common = omap_hwmod.o omap_hwmod_reset.o \
32diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
33index be5d005..e2b3981 100644
34--- a/arch/arm/mach-omap2/board-generic.c
35+++ b/arch/arm/mach-omap2/board-generic.c
36@@ -22,6 +22,7 @@
37 #include "common.h"
38 #include "common-board-devices.h"
39 #include "dss-common.h"
40+#include "soc.h"
41
42 #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
43 #define intc_of_init NULL
44@@ -50,6 +50,8 @@ static void __init omap_generic_init(void)
45 omap4_panda_display_init_of();
46 else if (of_machine_is_compatible("ti,omap4-sdp"))
47 omap_4430sdp_display_init_of();
48+ if (omap3_has_sgx())
49+ omap_sgx_init_of();
50 }
51
52 #ifdef CONFIG_SOC_OMAP2420
53diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
54index dfcc182..7d2f04e 100644
55--- a/arch/arm/mach-omap2/common.h
56+++ b/arch/arm/mach-omap2/common.h
57@@ -296,6 +296,7 @@ extern void omap_reserve(void);
58
59 struct omap_hwmod;
60 extern int omap_dss_reset(struct omap_hwmod *);
61+void __init omap_sgx_init_of(void);
62
63 /* SoC specific clock initializer */
64 extern int (*omap_clk_init)(void);
65diff --git a/arch/arm/mach-omap2/gpu.c b/arch/arm/mach-omap2/gpu.c
66new file mode 100644
67index 0000000..98a66cf
68--- /dev/null
69+++ b/arch/arm/mach-omap2/gpu.c
70@@ -0,0 +1,48 @@
71+/*
72+ * Deassert reset for AM33xx graphics device(SGX) hwmod
73+ *
74+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
75+ * Prathap MS <msprathap@ti.com>
76+ *
77+ * This program is free software; you can redistribute it and/or
78+ * modify it under the terms of the GNU General Public License as
79+ * published by the Free Software Foundation version 2.
80+ *
81+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
82+ * kind, whether express or implied; without even the implied warranty
83+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84+ * GNU General Public License for more details.
85+ */
86+#include <linux/of_platform.h>
87+#include "omap_device.h"
88+
89+void __init omap_sgx_init_of(void)
90+{
91+ struct device_node *node;
92+ struct platform_device *pdev;
93+ int ret = 0;
94+ node = of_find_compatible_node(NULL, NULL, "ti,sgx");
95+ if (!node)
96+ return;
97+ pdev = of_find_device_by_node(node);
98+ if (!pdev) {
99+ pr_warn("of_find_device_by_node() failed for sgx\n");
100+ return;
101+ }
102+ ret = omap_device_deassert_hardreset(pdev, "gfx");
103+ if (ret != 0)
104+ pr_warn("omap_device_deassert_hardreset() failed for sgx(gfx hwmod)\n");
105+
106+ node = of_find_compatible_node(NULL, NULL, "ti,am335x-timer");
107+ if (!node)
108+ return;
109+ pdev = of_find_device_by_node(node);
110+ if (!pdev) {
111+ pr_warn("of_find_device_by_node() failed for sgx\n");
112+ return;
113+ }
114+ ret = omap_device_deassert_hardreset(pdev, "timer7");
115+ if (ret != 0)
116+ pr_warn("omap_device_deassert_hardreset() failed for sgx(gfx hwmod)\n");
117+}
118+
119--
1201.7.1
121
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
deleted file mode 100755
index c425982..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1From 0f4e7d4b7d7314b38a9fd3497d7d4e0c36d19bff Mon Sep 17 00:00:00 2001
2From: Prathap M S <msprathap@ti.com>
3Date: Mon, 2 Sep 2013 12:05:23 +0530
4Subject: [PATCH 3/3] video: da8xx-fb: Add API to register wait for vsync callback
5
6This patch adds APIs to register and unregister wait for vsync callback.
7This is derived from commit id 2d44302545da24fd22912d964102bc31a7489e97
8This commit id was part of 3.2 kernel sources.
9
10Signed-off-by: Prathap M S <msprathap@ti.com>
11---
12 drivers/video/da8xx-fb.c | 33 +++++++++++++++++++++++++++++++++
13 include/video/da8xx-fb.h | 4 ++++
14 2 files changed, 37 insertions(+), 0 deletions(-)
15
16diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
17index 131cf4c..ef06b85 100644
18--- a/drivers/video/da8xx-fb.c
19+++ b/drivers/video/da8xx-fb.c
20@@ -199,6 +199,9 @@ static struct fb_fix_screeninfo da8xx_fb_fix = {
21 .accel = FB_ACCEL_NONE
22 };
23
24+static vsync_callback_t vsync_cb_handler;
25+static void *vsync_cb_arg;
26+
27 static struct fb_videomode known_lcd_panels[] = {
28 /* Sharp LCD035Q3DG01 */
29 [0] = {
30@@ -806,6 +809,32 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
31 return 0;
32 }
33
34+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx)
35+{
36+ if ((vsync_cb_handler == NULL) && (vsync_cb_arg == NULL)) {
37+ vsync_cb_arg = arg;
38+ vsync_cb_handler = handler;
39+ } else {
40+ return -EEXIST;
41+ }
42+
43+ return 0;
44+}
45+EXPORT_SYMBOL(register_vsync_cb);
46+
47+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx)
48+{
49+ if ((vsync_cb_handler == handler) && (vsync_cb_arg == arg)) {
50+ vsync_cb_handler = NULL;
51+ vsync_cb_arg = NULL;
52+ } else {
53+ return -ENXIO;
54+ }
55+
56+ return 0;
57+}
58+EXPORT_SYMBOL(unregister_vsync_cb);
59+
60 /* IRQ handler for version 2 of LCDC */
61 static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
62 {
63@@ -843,6 +872,8 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
64 LCD_DMA_FRM_BUF_CEILING_ADDR_0_REG);
65 par->vsync_flag = 1;
66 wake_up_interruptible(&par->vsync_wait);
67+ if (vsync_cb_handler)
68+ vsync_cb_handler(vsync_cb_arg);
69 }
70
71 if (stat & LCD_END_OF_FRAME1) {
72@@ -918,6 +949,8 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
73 LCD_DMA_FRM_BUF_CEILING_ADDR_1_REG);
74 par->vsync_flag = 1;
75 wake_up_interruptible(&par->vsync_wait);
76+ if (vsync_cb_handler)
77+ vsync_cb_handler(vsync_cb_arg);
78 }
79 }
80
81diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
82index efed3c3..a6cc484 100644
83--- a/include/video/da8xx-fb.h
84+++ b/include/video/da8xx-fb.h
85@@ -91,5 +91,9 @@ struct lcd_sync_arg {
86 /* Proprietary FB_SYNC_ flags */
87 #define FB_SYNC_CLK_INVERT 0x40000000
88
89+typedef void (*vsync_callback_t)(void *arg);
90+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
91+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx);
92+
93 #endif /* ifndef DA8XX_FB_H */
94
95--
961.7.1
97
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff
deleted file mode 100644
index 13b251a..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff
+++ /dev/null
@@ -1,128 +0,0 @@
1From 8221f36672b7a1336c2bf245c394f0b5453784a1 Mon Sep 17 00:00:00 2001
2From: Will Deacon <will.deacon@arm.com>
3Date: Thu, 26 Sep 2013 12:36:35 +0100
4Subject: [PATCH] ARM: perf: add support for perf registers API
5
6This patch implements the functions required for the perf registers API,
7allowing the perf tool to interface kernel register dumps with libunwind
8in order to provide userspace backtracing.
9
10B2Qt: Backported for 3.8 kernel
11
12Cc: Jean Pihet <jean.pihet@linaro.org>
13Signed-off-by: Will Deacon <will.deacon@arm.com>
14---
15 arch/arm/Kconfig | 2 ++
16 arch/arm/include/uapi/asm/Kbuild | 1 +
17 arch/arm/include/uapi/asm/perf_regs.h | 23 +++++++++++++++++++++++
18 arch/arm/kernel/Makefile | 1 +
19 arch/arm/kernel/perf_regs.c | 30 ++++++++++++++++++++++++++++++
20 5 files changed, 57 insertions(+)
21 create mode 100644 arch/arm/include/uapi/asm/perf_regs.h
22 create mode 100644 arch/arm/kernel/perf_regs.c
23
24diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
25index 67874b8..6f630be 100644
26--- a/arch/arm/Kconfig
27+++ b/arch/arm/Kconfig
28@@ -46,6 +46,8 @@ config ARM
29 select HAVE_MEMBLOCK
30 select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
31 select HAVE_PERF_EVENTS
32+ select HAVE_PERF_REGS
33+ select HAVE_PERF_USER_STACK_DUMP
34 select HAVE_REGS_AND_STACK_ACCESS_API
35 select HAVE_SYSCALL_TRACEPOINTS
36 select HAVE_UID16
37diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
38index 47bcb2d..570b82f 100644
39--- a/arch/arm/include/uapi/asm/Kbuild
40+++ b/arch/arm/include/uapi/asm/Kbuild
41@@ -8,6 +8,7 @@ header-y += hwcap.h
42 header-y += ioctls.h
43 header-y += kvm_para.h
44 header-y += mman.h
45+header-y += perf_regs.h
46 header-y += posix_types.h
47 header-y += ptrace.h
48 header-y += setup.h
49diff --git a/arch/arm/include/uapi/asm/perf_regs.h b/arch/arm/include/uapi/asm/perf_regs.h
50new file mode 100644
51index 0000000..ce59448
52--- /dev/null
53+++ b/arch/arm/include/uapi/asm/perf_regs.h
54@@ -0,0 +1,23 @@
55+#ifndef _ASM_ARM_PERF_REGS_H
56+#define _ASM_ARM_PERF_REGS_H
57+
58+enum perf_event_arm_regs {
59+ PERF_REG_ARM_R0,
60+ PERF_REG_ARM_R1,
61+ PERF_REG_ARM_R2,
62+ PERF_REG_ARM_R3,
63+ PERF_REG_ARM_R4,
64+ PERF_REG_ARM_R5,
65+ PERF_REG_ARM_R6,
66+ PERF_REG_ARM_R7,
67+ PERF_REG_ARM_R8,
68+ PERF_REG_ARM_R9,
69+ PERF_REG_ARM_R10,
70+ PERF_REG_ARM_FP,
71+ PERF_REG_ARM_IP,
72+ PERF_REG_ARM_SP,
73+ PERF_REG_ARM_LR,
74+ PERF_REG_ARM_PC,
75+ PERF_REG_ARM_MAX,
76+};
77+#endif /* _ASM_ARM_PERF_REGS_H */
78diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
79index 5bbec7b..c6ab18f 100644
80--- a/arch/arm/kernel/Makefile
81+++ b/arch/arm/kernel/Makefile
82@@ -69,6 +69,7 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o
83 obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o
84 obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o
85 obj-$(CONFIG_IWMMXT) += iwmmxt.o
86+obj-$(CONFIG_PERF_EVENTS) += perf_regs.o
87 obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o
88 AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
89 obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
90diff --git a/arch/arm/kernel/perf_regs.c b/arch/arm/kernel/perf_regs.c
91new file mode 100644
92index 0000000..6e4379c
93--- /dev/null
94+++ b/arch/arm/kernel/perf_regs.c
95@@ -0,0 +1,30 @@
96+
97+#include <linux/errno.h>
98+#include <linux/kernel.h>
99+#include <linux/perf_event.h>
100+#include <linux/bug.h>
101+#include <asm/perf_regs.h>
102+#include <asm/ptrace.h>
103+
104+u64 perf_reg_value(struct pt_regs *regs, int idx)
105+{
106+ if (WARN_ON_ONCE((u32)idx >= PERF_REG_ARM_MAX))
107+ return 0;
108+
109+ return regs->uregs[idx];
110+}
111+
112+#define REG_RESERVED (~((1ULL << PERF_REG_ARM_MAX) - 1))
113+
114+int perf_reg_validate(u64 mask)
115+{
116+ if (!mask || mask & REG_RESERVED)
117+ return -EINVAL;
118+
119+ return 0;
120+}
121+
122+u64 perf_reg_abi(struct task_struct *task)
123+{
124+ return PERF_SAMPLE_REGS_ABI_32;
125+}
126--
1271.9.1
128
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch
deleted file mode 100644
index e3e8d21..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch
+++ /dev/null
@@ -1,163 +0,0 @@
1From 26f603c457e0af9f5f6a0ddda66e69978c7f43b4 Mon Sep 17 00:00:00 2001
2From: Will Deacon <will.deacon@arm.com>
3Date: Thu, 26 Sep 2013 12:36:36 +0100
4Subject: [PATCH] ARM: perf: wire up perf_regs and unwind support for ARM
5
6This patch hooks in the perf_regs and libunwind code for ARM.
7
8B2Qt: Backported for 3.8 kernel
9
10Cc: Jean Pihet <jean.pihet@linaro.org>
11Signed-off-by: Will Deacon <will.deacon@arm.com>
12---
13 tools/perf/Makefile | 4 +++
14 tools/perf/arch/arm/Makefile | 3 ++
15 tools/perf/arch/arm/include/perf_regs.h | 54 +++++++++++++++++++++++++++++++++
16 tools/perf/arch/arm/util/unwind.c | 48 +++++++++++++++++++++++++++++
17 4 files changed, 109 insertions(+)
18 create mode 100644 tools/perf/arch/arm/include/perf_regs.h
19 create mode 100644 tools/perf/arch/arm/util/unwind.c
20
21diff --git a/tools/perf/Makefile b/tools/perf/Makefile
22index fb1b1c4..316c575 100644
23--- a/tools/perf/Makefile
24+++ b/tools/perf/Makefile
25@@ -84,6 +84,10 @@ ifeq ($(ARCH),x86_64)
26 NO_PERF_REGS := 0
27 LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
28 endif
29+ifeq ($(ARCH),arm)
30+ NO_PERF_REGS := 0
31+ LIBUNWIND_LIBS = -lunwind -lunwind-arm
32+endif
33
34 # Treat warnings as errors unless directed not to
35 ifneq ($(WERROR),0)
36diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile
37index 15130b5..fe9b61e 100644
38--- a/tools/perf/arch/arm/Makefile
39+++ b/tools/perf/arch/arm/Makefile
40@@ -2,3 +2,6 @@ ifndef NO_DWARF
41 PERF_HAVE_DWARF_REGS := 1
42 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
43 endif
44+ifndef NO_LIBUNWIND
45+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
46+endif
47diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h
48new file mode 100644
49index 0000000..2a1cfde
50--- /dev/null
51+++ b/tools/perf/arch/arm/include/perf_regs.h
52@@ -0,0 +1,54 @@
53+#ifndef ARCH_PERF_REGS_H
54+#define ARCH_PERF_REGS_H
55+
56+#include <stdlib.h>
57+#include "../../util/types.h"
58+#include <asm/perf_regs.h>
59+
60+#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1)
61+#define PERF_REG_IP PERF_REG_ARM_PC
62+#define PERF_REG_SP PERF_REG_ARM_SP
63+
64+static inline const char *perf_reg_name(int id)
65+{
66+ switch (id) {
67+ case PERF_REG_ARM_R0:
68+ return "r0";
69+ case PERF_REG_ARM_R1:
70+ return "r1";
71+ case PERF_REG_ARM_R2:
72+ return "r2";
73+ case PERF_REG_ARM_R3:
74+ return "r3";
75+ case PERF_REG_ARM_R4:
76+ return "r4";
77+ case PERF_REG_ARM_R5:
78+ return "r5";
79+ case PERF_REG_ARM_R6:
80+ return "r6";
81+ case PERF_REG_ARM_R7:
82+ return "r7";
83+ case PERF_REG_ARM_R8:
84+ return "r8";
85+ case PERF_REG_ARM_R9:
86+ return "r9";
87+ case PERF_REG_ARM_R10:
88+ return "r10";
89+ case PERF_REG_ARM_FP:
90+ return "fp";
91+ case PERF_REG_ARM_IP:
92+ return "ip";
93+ case PERF_REG_ARM_SP:
94+ return "sp";
95+ case PERF_REG_ARM_LR:
96+ return "lr";
97+ case PERF_REG_ARM_PC:
98+ return "pc";
99+ default:
100+ return NULL;
101+ }
102+
103+ return NULL;
104+}
105+
106+#endif /* ARCH_PERF_REGS_H */
107diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind.c
108new file mode 100644
109index 0000000..da3dc95
110--- /dev/null
111+++ b/tools/perf/arch/arm/util/unwind.c
112@@ -0,0 +1,48 @@
113+
114+#include <errno.h>
115+#include <libunwind.h>
116+#include "perf_regs.h"
117+#include "../../util/unwind.h"
118+
119+int unwind__arch_reg_id(int regnum)
120+{
121+ switch (regnum) {
122+ case UNW_ARM_R0:
123+ return PERF_REG_ARM_R0;
124+ case UNW_ARM_R1:
125+ return PERF_REG_ARM_R1;
126+ case UNW_ARM_R2:
127+ return PERF_REG_ARM_R2;
128+ case UNW_ARM_R3:
129+ return PERF_REG_ARM_R3;
130+ case UNW_ARM_R4:
131+ return PERF_REG_ARM_R4;
132+ case UNW_ARM_R5:
133+ return PERF_REG_ARM_R5;
134+ case UNW_ARM_R6:
135+ return PERF_REG_ARM_R6;
136+ case UNW_ARM_R7:
137+ return PERF_REG_ARM_R7;
138+ case UNW_ARM_R8:
139+ return PERF_REG_ARM_R8;
140+ case UNW_ARM_R9:
141+ return PERF_REG_ARM_R9;
142+ case UNW_ARM_R10:
143+ return PERF_REG_ARM_R10;
144+ case UNW_ARM_R11:
145+ return PERF_REG_ARM_FP;
146+ case UNW_ARM_R12:
147+ return PERF_REG_ARM_IP;
148+ case UNW_ARM_R13:
149+ return PERF_REG_ARM_SP;
150+ case UNW_ARM_R14:
151+ return PERF_REG_ARM_LR;
152+ case UNW_ARM_R15:
153+ return PERF_REG_ARM_PC;
154+ default:
155+ pr_err("unwind: invalid reg id %d\n", regnum);
156+ return -EINVAL;
157+ }
158+
159+ return -EINVAL;
160+}
161--
1621.9.1
163
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
deleted file mode 100644
index 3c61e27..0000000
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ /dev/null
@@ -1,52 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31SRC_URI += "\
32 file://0001-AM335x-Adding-SGX-DT-node.patch \
33 file://0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch \
34 file://0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch \
35 file://ARM-perf-add-support-for-perf-registers-API.diff \
36 file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
37 file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
38 file://0001-kernel-add-support-for-gcc-5.patch \
39 file://0001-Change-extern-inline-to-static-inline.patch \
40 "
41
42INSANE_SKIP_${PN} = "installed-vs-shipped"
43KERNEL_IMAGETYPE = "zImage"
44B = "${S}"
45
46do_configure_prepend() {
47 sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
48 -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
49 -i ${WORKDIR}/defconfig
50 echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig
51 echo "CONFIG_MOUSE_PS2=n" >> ${WORKDIR}/defconfig
52}
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
deleted file mode 100644
index 26ae06e..0000000
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script.bb
+++ /dev/null
@@ -1,57 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "U-Boot script to start up BeagleBone Black"
31LICENSE = "The-Qt-Company-DCLA-2.1"
32LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
33PR = "r0"
34
35COMPATIBLE_MACHINE = "(beaglebone)"
36PV = "20140225"
37
38SRC_URI = "file://uEnv.txt"
39
40inherit deploy
41
42do_deploy () {
43 install -d ${DEPLOYDIR}
44 install ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv-${MACHINE}-${PV}-${PR}.txt
45
46 cd ${DEPLOYDIR}
47 rm -f uEnv-${MACHINE}.txt
48 ln -sf uEnv-${MACHINE}-${PV}-${PR}.txt uEnv-${MACHINE}.txt
49}
50
51addtask deploy after do_install before do_build
52
53do_compile[noexec] = "1"
54do_install[noexec] = "1"
55do_populate_sysroot[noexec] = "1"
56
57PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
deleted file mode 100644
index d41ef60..0000000
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
+++ /dev/null
@@ -1,6 +0,0 @@
1optargs=consoleblank=0 vt.global_cursor_default=0 quiet
2# extra options to support older u-boot (2013)
3bootfile=zImage
4loadaddr=0x80200000
5loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
6mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${loadaddr} - ${fdtaddr}
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr b/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr
deleted file mode 100755
index d6f6c82..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr
+++ /dev/null
@@ -1,117 +0,0 @@
1#!/bin/sh
2PATH=$PATH:/usr/sbin
3
4# Check if an fb device is available. If not then just go ahead and
5# exit because we have no display.
6fbset > /dev/null 2>&1
7if [ "$?" == "1" ]
8then
9 # looks like there is no display, so let's exit
10 exit 0
11fi
12
13BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
14YRES="$(fbset | grep geom | awk '{print $3}')"
15
16CPUTYPE="$(cputype)"
17
18if [ "$1" = "" ]; then
19 echo PVR-INIT: Please use start, stop, or restart.
20 exit 1
21fi
22
23if [ "$1" = "stop" -o "$1" = "restart" ]; then
24 echo Stopping PVR
25 rmmod bufferclass_ti
26 rmmod omaplfb 2>/dev/null
27 rmmod pvrsrvkm 2>/dev/null
28fi
29
30if [ "$1" = "stop" ]; then
31 exit 0
32fi
33
34# Set RGBA ordering to something the drivers like
35if [ "$BITSPERPIXEL" = "32" ] ; then
36 fbset -rgba 8/16,8/8,8/0,8/24
37fi
38
39# Try to enable triple buffering when there's enough VRAM
40fbset -vyres $(expr $YRES \* 3)
41
42sgxprepare () {
43 echo Starting PVR
44
45 modprobe omaplfb
46 modprobe bufferclass_ti
47
48 pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
49 bc_maj=`grep "bc" /proc/devices | cut -b1,2,3`
50
51 if [ -e /dev/pvrsrvkm ] ; then
52 rm -f /dev/pvrsrvkm
53 fi
54
55 mknod /dev/pvrsrvkm c $pvr_maj 0
56 chmod 666 /dev/pvrsrvkm
57
58 touch /etc/powervr-esrev
59
60 SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
61}
62
63sgxfinish () {
64 # Fix up a bug in opkg
65 if [ $(readlink /usr/lib/libsrv_um.so) != $(readlink /usr/lib/libsrv_um.so.1) ] ; then
66 cd /usr/lib
67 ln -sf $(readlink /usr/lib/libsrv_um.so.1) libsrv_um.so
68 fi
69
70 if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
71 echo -n "Starting SGX fixup for"
72 echo " ES${ES_REVISION}.x"
73 cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib
74 cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin
75 echo "${ES_REVISION}" > /etc/powervr-esrev
76 fi
77
78 /usr/bin/pvrsrvctl --start --no-module
79}
80
81case $CPUTYPE in
82"OMAP3530")
83 sgxprepare
84
85 devmem2 0x48004B48 w 0x2 > /dev/null
86 devmem2 0x48004B10 w 0x1 > /dev/null
87 devmem2 0x48004B00 w 0x2 > /dev/null
88
89 ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
90
91 sgxfinish
92 ;;
93"TI33XX")
94 sgxprepare
95
96 devmem2 0x44e01104 w 0x0 > /dev/null
97 devmem2 0x44e00904 w 0x2 > /dev/null
98
99 ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:8: | tail -n1 | awk -F': ' '{print $2}')"
100
101 sgxfinish
102 ;;
103"TI816x")
104 sgxprepare
105
106 devmem2 0x48180F04 w 0x0 > /dev/null
107 devmem2 0x48180900 w 0x2 > /dev/null
108 devmem2 0x48180920 w 0x2 > /dev/null
109
110 ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
111
112 sgxfinish
113 ;;
114*)
115 echo No SGX hardware, not starting PVR
116 ;;
117esac
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
deleted file mode 100644
index 3d909f9..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ /dev/null
@@ -1,50 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30BINLOCATION_omap3 = "${S}/gfx_rel_es5.x"
31
32LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
33
34do_install_append() {
35 echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
36}
37
38# Inhibit warnings about files being stripped.
39INHIBIT_PACKAGE_STRIP = "1"
40
41pkg_postinst_${PN}_append() {
42ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
43echo ${ESREV} > $D${sysconfdir}/powervr-esrev
44}
45
46RRECOMMENDS_${PN} = "omap3-sgx-modules"
47RRECOMMENDS_${PN}-blitwsegl = ""
48RRECOMMENDS_${PN}-flipwsegl = ""
49RRECOMMENDS_${PN}-frontwsegl = ""
50RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
deleted file mode 100644
index 1b1bf22..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1require recipes-graphics/libgles/libgles-omap3-no-x.inc
2
3FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${COREBASE}/../meta-ti/recipes-graphics/libgles/${PN}:"
4
5LICENSE = "TI-TSPA"
6
7PR = "${INC_PR}.3"
8
9BINLOCATION_omap3 = "${S}/gfx_rel_es3.x"
10BINLOCATION_ti816x = "${S}/gfx_rel_es6.x"
11BINLOCATION_ti814x = "${S}/gfx_rel_es6.x"
12BINLOCATION_ti33x = "${S}/gfx_rel_es8.x"
13
14PLATFORM = "LinuxARMV7"
15PVR_INIT = "pvrsrvctl"
16
17# download required binary distribution from:
18# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
19# see libgles-omap3.inc for detailed installation instructions
20
21SGXPV = "4_10_00_01"
22IMGPV = "1.9.2188537"
23
24TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
25
26# Select the corresponding hardfp/softfp filename and checksums based on tune flags
27BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
28MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
29SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
30
31BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
32MD5SUM_HARDFP = "15a3ccb66e98580e474fc112565f66b6"
33SHA256SUM_HARDFP = "4d94d5a1869b228ce12027783fc5425c92e9b66685c501247889f1f167e66c9d"
34
35BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
36
37SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
38 file://cputype \
39 file://rc.pvr \
40 file://99-bufferclass.rules \
41"
42
43SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
44SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
45
46S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
47
48LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FRONTWSEGL.so.1"
49
50do_configure_append() {
51 # PLAT_CC might not have needed arguments, so use CC instead.
52 for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do
53 sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak
54 done
55}
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
deleted file mode 100644
index 0d557ce..0000000
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
+++ /dev/null
@@ -1,49 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31
32BINLOCATION_omap3 = "${S}/gfx_rel_es5.x"
33BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x"
34
35LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
36
37# Inhibit warnings about files being stripped.
38INHIBIT_PACKAGE_STRIP = "1"
39
40pkg_postinst_${PN}_append() {
41ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
42echo ${ESREV} > $D${sysconfdir}/powervr-esrev
43}
44
45RRECOMMENDS_${PN} = "omap3-sgx-modules"
46RRECOMMENDS_${PN}-blitwsegl = ""
47RRECOMMENDS_${PN}-flipwsegl = ""
48RRECOMMENDS_${PN}-frontwsegl = ""
49RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
index 54dca0f..fb3bc7a 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.14.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend
@@ -32,4 +32,3 @@ SRC_URI += "\
32 file://usb-serial.cfg \ 32 file://usb-serial.cfg \
33 " 33 "
34KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" 34KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
35KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch
deleted file mode 100644
index ce50479..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From e55f63a07e5266095da89b7f94122fcba9bdef04 Mon Sep 17 00:00:00 2001
2From: Prathap M S <msprathap@ti.com>
3Date: Tue, 19 Nov 2013 16:33:24 +0530
4Subject: [PATCH 1/1] Graphics SDK 04.10.00.01 : AM335x sgx irq change
5
6This patch enables PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO for AM335x.
7This is required with 3.8 kernel onwards which uses DT.
8This will enable the path of getting sgx irq number dynamically.
9
10Signed-off-by: Prathap M S <msprathap@ti.com>
11---
12 services4/system/ti335x/syslocal.h | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/services4/system/ti335x/syslocal.h b/services4/system/ti335x/syslocal.h
16index 090b38d..222d52d 100644
17--- a/services4/system/ti335x/syslocal.h
18+++ b/services4/system/ti335x/syslocal.h
19@@ -69,8 +69,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20 #if !defined(LDM_PLATFORM)
21 #error "LDM_PLATFORM must be set"
22 #endif
23-//#define PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO
24-//#include <linux/platform_device.h>
25+#define PVR_LINUX_DYNAMIC_SGX_RESOURCE_INFO
26+#include <linux/platform_device.h>
27 #endif
28
29 #if ((defined(DEBUG) || defined(TIMING)) && \
30--
311.7.9.5
32
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch
deleted file mode 100644
index c553354..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1diff --git a/services4/srvkm/env/linux/module.c b/services4/srvkm/env/linux/module.c
2index 668dc2d..2247aad 100644
3--- a/services4/srvkm/env/linux/module.c
4+++ b/services4/srvkm/env/linux/module.c
5@@ -84,6 +84,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 #include <linux/module.h>
7 #include <linux/fs.h>
8 #include <linux/proc_fs.h>
9+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
10+#include <linux/of.h>
11+#endif
12
13 #if defined(SUPPORT_DRI_DRM)
14 #include <drm/drmP.h>
15@@ -296,10 +299,24 @@ static struct platform_device_id powervr_id_table[] __devinitdata = {
16 };
17 #endif
18
19+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
20+static const struct of_device_id omap_sgx_of_match[] = {
21+ {
22+ .compatible = "ti,sgx",
23+ },
24+ {},
25+};
26+MODULE_DEVICE_TABLE(of, omap_sgx_of_match);
27+#endif
28+
29+
30 static LDM_DRV powervr_driver = {
31 #if defined(PVR_LDM_PLATFORM_MODULE)
32 .driver = {
33 .name = DRVNAME,
34+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
35+ .of_match_table = of_match_ptr(omap_sgx_of_match),
36+#endif
37 },
38 #endif
39 #if defined(PVR_LDM_PCI_MODULE)
40@@ -362,7 +379,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
41 #endif
42 {
43 SYS_DATA *psSysData;
44-
45+
46 PVR_TRACE(("PVRSRVDriverProbe(pDevice=%p)", pDevice));
47
48 #if 0 /* INTEGRATION_POINT */
49--
501.7.9.5
51
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch
deleted file mode 100644
index acef54b..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1diff --git a/services4/3rdparty/linux_drm/Kbuild b/services4/3rdparty/linux_drm/Kbuild
2index d01ef39..ccca3cd 100755
3--- a/services4/3rdparty/linux_drm/Kbuild
4+++ b/services4/3rdparty/linux_drm/Kbuild
5@@ -26,38 +26,38 @@ endif
6 endif
7
8 obj-m := drm.o
9-ifeq ($(TI_PLATFORM),omap4)
10-drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drawable.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
11- drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
12- drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
13- drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
14- drm_crtc.o drm_modes.o drm_edid.o \
15- drm_info.o drm_debugfs.o drm_encoder_slave.o
16-else
17+#ifeq ($(TI_PLATFORM),omap4)
18+#drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drawable.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
19+# drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
20+# drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
21+# drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
22+# drm_crtc.o drm_modes.o drm_edid.o \
23+# drm_info.o drm_debugfs.o drm_encoder_slave.o
24+#else
25 # Works for 2.6.37 till 3.2 kernel
26-drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
27- drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
28- drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
29- drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
30- drm_crtc.o drm_modes.o drm_edid.o \
31- drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
32-endif
33-
34-# For 3.3 kernel only
35 #drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
36 # drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
37 # drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
38-# drm_sysfs.o drm_hashtab.o drm_mm.o \
39+# drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
40 # drm_crtc.o drm_modes.o drm_edid.o \
41 # drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
42+#endif
43
44-# For greater than/equal to 3.4 till 3.8 kernel
45+# For 3.3 kernel only
46 #drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
47 # drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
48 # drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
49 # drm_sysfs.o drm_hashtab.o drm_mm.o \
50 # drm_crtc.o drm_modes.o drm_edid.o \
51-# drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o drm_prime.o
52+# drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o
53+
54+# For greater than/equal to 3.4 till 3.8 kernel
55+drm-y := pvr_drm_stubs.o drm_auth.o drm_bufs.o drm_cache.o drm_context.o drm_dma.o drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
56+ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
57+ drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
58+ drm_sysfs.o drm_hashtab.o drm_mm.o \
59+ drm_crtc.o drm_modes.o drm_edid.o \
60+ drm_info.o drm_debugfs.o drm_encoder_slave.o drm_global.o drm_platform.o drm_trace_points.o drm_prime.o
61
62 # less than 2.6.32 kernel
63
diff --git a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb
deleted file mode 100644
index b83e1ee..0000000
--- a/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb
+++ /dev/null
@@ -1,66 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "4_10_00_01"
9IMGPV = "1.9.2188537"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "c"
14PR = "${MACHINE_KERNEL_PR}"
15
16DEFAULT_PREFERENCE = "-1"
17
18# Select the corresponding hardfp/softfp filename and checksums based on tune flags
19BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
20MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
21SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
22
23BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
24MD5SUM_HARDFP = "15a3ccb66e98580e474fc112565f66b6"
25SHA256SUM_HARDFP = "4d94d5a1869b228ce12027783fc5425c92e9b66685c501247889f1f167e66c9d"
26
27BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
28
29SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
30 file://Change-for-interfacing-with-SGX-DT-node.patch \
31 file://linux-3.8.patch \
32 file://0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch \
33 "
34
35SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
36SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
37
38TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
39S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
40
41PVRBUILD = "release"
42export KERNELDIR = "${STAGING_KERNEL_DIR}"
43
44INHIBIT_PACKAGE_STRIP = "1"
45
46TI_PLATFORM_omap3 = "omap3630"
47TI_PLATFORM_ti814x = "ti81xx"
48TI_PLATFORM_ti816x = "ti81xx"
49TI_PLATFORM_ti33x = "ti335x"
50
51MODULESLOCATION_omap3 = "dc_omapfb3_linux"
52MODULESLOCATION_ti814x = "dc_ti81xx_linux"
53MODULESLOCATION_ti816x = "dc_ti81xx_linux"
54MODULESLOCATION_ti33x = "dc_ti335x_linux"
55
56MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
57
58MAKE_TARGETS_append_ti33x = " PM_RUNTIME=1"
59
60do_install() {
61 mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
62 cp ${S}/pvrsrvkm.ko \
63 ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
64 ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
65 ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
66}
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch b/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch
deleted file mode 100644
index 8c3ee2d..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From c7edbae8c34f73abb1974c0e8722f6f3c7b49f45 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Tue, 17 Sep 2013 08:16:51 +0300
4Subject: [PATCH] am335x-evm: disable console cursor blinking
5
6---
7 include/configs/am335x_evm.h | 2 +
8 1 file changed, 2 insertion(++)
9
10diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
11index 90e35ee..f28e842 100644
12--- a/include/configs/am335x_evm.h
13+++ b/include/configs/am335x_evm.h
14@@ -86,6 +86,8 @@
15 "ip_method=none\0" \
16 "bootargs_defaults=setenv bootargs " \
17 "console=${console} " \
18+ "consoleblank=0 " \
19+ "vt.global_cursor_default=0 " \
20 "${optargs}\0" \
21 "mmcargs=run bootargs_defaults;" \
22 "setenv bootargs ${bootargs} " \
23--
241.7.10.4
25
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
deleted file mode 100644
index a9c3c0d..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
31SRC_URI += " \
32 file://0001-am335x-evm-disable-console-cursor-blinking.patch \
33 "
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
deleted file mode 100644
index 25dd9e4..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From bde714b9bfeafe46abc1078c09f6efac0e7b6478 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Wed, 22 Jan 2014 11:30:59 +0200
4Subject: [PATCH] BBB: disable console cursor blinking
5
6---
7 include/configs/am335x_evm.h | 2 ++
8 1 file changed, 2 insertions(+)
9
10diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
11index d53f17d..1b3d2a4 100644
12--- a/include/configs/am335x_evm.h
13+++ b/include/configs/am335x_evm.h
14@@ -59,6 +59,8 @@
15 "ramrootfstype=ext2\0" \
16 "mmcargs=setenv bootargs console=${console} " \
17 "${optargs} " \
18+ "consoleblank=0 " \
19+ "vt.global_cursor_default=0 " \
20 "root=${mmcroot} " \
21 "rootfstype=${mmcrootfstype}\0" \
22 "spiroot=/dev/mtdblock4 rw\0" \
23--
241.8.3.2
25
diff --git a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
deleted file mode 100644
index b638ddc..0000000
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31SRC_URI += " \
32 file://0001-BBB-disable-console-cursor-blinking.patch \
33 "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index f6e6f84..deb8e49 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -6,7 +6,6 @@
6 <remote fetch="git://git.yoctoproject.org" name="yocto"/> 6 <remote fetch="git://git.yoctoproject.org" name="yocto"/>
7 <remote fetch="git://git.openembedded.org" name="oe"/> 7 <remote fetch="git://git.openembedded.org" name="oe"/>
8 <remote fetch="git://github.com/Freescale" name="freescale"/> 8 <remote fetch="git://github.com/Freescale" name="freescale"/>
9 <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
10 <remote fetch="git://github.com/architech-boards" name="architech"/> 9 <remote fetch="git://github.com/architech-boards" name="architech"/>
11 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> 10 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
12 <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/> 11 <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
@@ -35,12 +34,12 @@
35 remote="yocto" 34 remote="yocto"
36 revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b" 35 revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
37 path="sources/meta-fsl-arm" 36 path="sources/meta-fsl-arm"
38 groups="notdefault,external,fsl,architech,ti,bbb,smx6,renesas"/> 37 groups="notdefault,external,fsl,architech,ti,smx6,renesas"/>
39 <project name="meta-ti" 38 <project name="meta-ti"
40 remote="yocto" 39 remote="yocto"
41 revision="f807c7185321fb407e82c529ddff310dc037f727" 40 revision="f807c7185321fb407e82c529ddff310dc037f727"
42 path="sources/meta-ti" 41 path="sources/meta-ti"
43 groups="notdefault,external,ti,bbb"/> 42 groups="notdefault,external,ti"/>
44 <project name="meta-raspberrypi" 43 <project name="meta-raspberrypi"
45 remote="yocto" 44 remote="yocto"
46 revision="2745399f75d7564fcc586d0365ff73be47849d0e" 45 revision="2745399f75d7564fcc586d0365ff73be47849d0e"
@@ -51,11 +50,6 @@
51 revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e" 50 revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
52 path="sources/meta-fsl-arm-extra" 51 path="sources/meta-fsl-arm-extra"
53 groups="notdefault,external,fsl,architech,smx6"/> 52 groups="notdefault,external,fsl,architech,smx6"/>
54 <project name="meta-beagleboard"
55 remote="beagleboard"
56 revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
57 path="sources/meta-beagleboard"
58 groups="notdefault,external,bbb"/>
59 <project name="meta-tibidabo" 53 <project name="meta-tibidabo"
60 remote="architech" 54 remote="architech"
61 revision="06c6b09e0776507e1230aa98b5ca10d9d3968286" 55 revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 9b40650..5825bf1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -68,12 +68,9 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
68 tibidabo) 68 tibidabo)
69 LAYERSCONF="bblayers.conf.tibidabo.sample" 69 LAYERSCONF="bblayers.conf.tibidabo.sample"
70 ;; 70 ;;
71 beagleboard|am335x-evm) 71 beagleboard|beaglebone|am335x-evm)
72 LAYERSCONF="bblayers.conf.ti.sample" 72 LAYERSCONF="bblayers.conf.ti.sample"
73 ;; 73 ;;
74 beaglebone)
75 LAYERSCONF="bblayers.conf.bbb.sample"
76 ;;
77 raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3) 74 raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
78 LAYERSCONF="bblayers.conf.rpi.sample" 75 LAYERSCONF="bblayers.conf.rpi.sample"
79 ;; 76 ;;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-22 12:07:52 +0000