From 0dded51636b689237af7fdcda1719790c7fb3aa7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Sep 2014 12:34:23 +0300 Subject: Move meta-ti specific files to separate layer Create new layer for recipes and files that required only when meta-ti layer is used. For now, the bblayers.conf template still includes the new layer as well. Change-Id: Iab8f6b3a61578e7a9579066ae7facca5a9a1f33b Reviewed-by: Eirik Aavitsland --- meta-ti-extras/conf/layer.conf | 33 ++++++ .../recipes/libgles/libgles-omap3/rc.pvr | 117 +++++++++++++++++++++ .../libgles/libgles-omap3_4.09.00.01.bbappend | 43 ++++++++ .../recipes/libgles/libgles-omap3_4.10.00.01.bb | 48 +++++++++ .../libgles/libgles-omap3_5.01.01.01.bbappend | 42 ++++++++ .../recipes/linux/linux-am335x-psp_3.2.bbappend | 40 +++++++ .../recipes/linux/linux-mainline_3.2.bbappend | 42 ++++++++ .../recipes/linux/linux-ti-staging/usb-serial.cfg | 4 + .../recipes/linux/linux-ti-staging_3.12.bbappend | 28 +++++ ...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 | 26 +++++ .../0001-BBB-disable-console-cursor-blinking.patch | 25 +++++ .../u-boot/u-boot-ti-staging_2013.10.bbappend | 26 +++++ 17 files changed, 711 insertions(+) create mode 100644 meta-ti-extras/conf/layer.conf create mode 100755 meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr create mode 100644 meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend create mode 100644 meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb create mode 100644 meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend create mode 100644 meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend create mode 100644 meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend create mode 100644 meta-ti-extras/recipes/linux/linux-ti-staging/usb-serial.cfg create mode 100644 meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend create mode 100644 meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch create mode 100644 meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch create mode 100644 meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch create mode 100644 meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb create mode 100644 meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch create mode 100644 meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend create mode 100644 meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch create mode 100644 meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend (limited to 'meta-ti-extras') diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf new file mode 100644 index 0000000..120b507 --- /dev/null +++ b/meta-ti-extras/conf/layer.conf @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ + ${LAYERDIR}/recipes*/*/*.bbappend \ + " + +BBFILE_COLLECTIONS += "b2qt_ti" +BBFILE_PATTERN_b2qt_ti := "^${LAYERDIR}/" +BBFILE_PRIORITY_b2qt_ti = "20" diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr b/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr new file mode 100755 index 0000000..d6f6c82 --- /dev/null +++ b/meta-ti-extras/recipes/libgles/libgles-omap3/rc.pvr @@ -0,0 +1,117 @@ +#!/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 new file mode 100644 index 0000000..0646e73 --- /dev/null +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +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 new file mode 100644 index 0000000..6a8c1ba --- /dev/null +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb @@ -0,0 +1,48 @@ +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" 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 new file mode 100644 index 0000000..9a90577 --- /dev/null +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend @@ -0,0 +1,42 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +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-am335x-psp_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend new file mode 100644 index 0000000..fd7dd31 --- /dev/null +++ b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +do_configure_append() { + # FunctionFS for adb + echo "CONFIG_USB_LIBCOMPOSITE=y" >> ${S}/.config + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "CONFIG_USB_FUNCTIONFS_ETH=n" >> ${S}/.config + echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${S}/.config + echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${S}/.config + + echo "CONFIG_DEVTMPFS=y" >> ${S}/.config + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${S}/.config + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${S}/.config + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${S}/.config + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${S}/.config + + yes '' | oe_runmake oldconfig +} diff --git a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend new file mode 100644 index 0000000..9e195dc --- /dev/null +++ b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend @@ -0,0 +1,42 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +do_configure_prepend() { + # Builtin network driver, so networking is initialized correctly during boot + echo "CONFIG_USB_NET_SMSC95XX=y" >> ${WORKDIR}/defconfig + + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS_ETH=n" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + + # Remove beagleboard logo + if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then + rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm + fi +} diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging/usb-serial.cfg b/meta-ti-extras/recipes/linux/linux-ti-staging/usb-serial.cfg new file mode 100644 index 0000000..8f0688e --- /dev/null +++ b/meta-ti-extras/recipes/linux/linux-ti-staging/usb-serial.cfg @@ -0,0 +1,4 @@ +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_PL2303=m diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend new file mode 100644 index 0000000..b2d6104 --- /dev/null +++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend @@ -0,0 +1,28 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_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/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 new file mode 100644 index 0000000..ce50479 --- /dev/null +++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/0001-Graphics-SDK-04.10.00.01-AM335x-sgx-irq-change.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 0000000..c553354 --- /dev/null +++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/Change-for-interfacing-with-SGX-DT-node.patch @@ -0,0 +1,51 @@ +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 new file mode 100644 index 0000000..acef54b --- /dev/null +++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules/linux-3.8.patch @@ -0,0 +1,63 @@ +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 new file mode 100644 index 0000000..b83e1ee --- /dev/null +++ b/meta-ti-extras/recipes/powervr-drivers/omap3-sgx-modules_4.10.00.01.bb @@ -0,0 +1,66 @@ +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 new file mode 100644 index 0000000..8c3ee2d --- /dev/null +++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x/0001-am335x-evm-disable-console-cursor-blinking.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..2b1c656 --- /dev/null +++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-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 new file mode 100644 index 0000000..25dd9e4 --- /dev/null +++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..bad928b --- /dev/null +++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-BBB-disable-console-cursor-blinking.patch \ + " -- cgit v1.2.3-54-g00ecf