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