package/ti-sgx-{km, um, demos}: bump to latest TI version

ti-sgx-um

- Bump the version that matches TI SDK 06.00.00.07 plus one pull request
  that updates the EGL/GLES headers required to build qt5base.
- Rewrite the init script, following the current template and using the
  pvrsrvctl command (pvrsrvinit does not exit anymore).
- Remove powervr.ini, no longer used in the TI SDK.
- Select and add a dependency on wayland, or else packages that link to
  libEGL (e.g. cairo) fail to link due to a missing libwayland-server.
- Update license file name.

ti-sgx-demos

- Bump the version that matches TI SDK 06.00.00.07 plus one pull request
  (matching ti-sgx-um).

ti-sgx-km

- Bump the version that matches TI SDK 06.00.00.07.
- Remove stray empty lines.
- Fix license file path.

All packages

- Use HTTP to clone Git repositories.
- Update URL in Config.in files, pointing to cgit and using HTTPS.
- Add hashes for all license files.

The buildroot package only supports the target am335x. Support for other
boards can be added by adding menu entries to select the correct target
product.

Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
Signed-off-by: Carlos Santos <unixmania@gmail.com>
[Thomas:
 - add missing depends on BR2_PACKAGE_HAS_UDEV from Config.in,
   inherited from ti-sgx-libgbm]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Lothar Felten 2019-11-15 09:49:58 -03:00 committed by Thomas Petazzoni
parent fb7fb9bda6
commit c38b5566fe
12 changed files with 133 additions and 94 deletions

View File

@ -6,4 +6,4 @@ config BR2_PACKAGE_TI_SGX_DEMOS
Technologies are availabe as binaries only. The binaries Technologies are availabe as binaries only. The binaries
are compiled for the TI SGX implementation. are compiled for the TI SGX implementation.
http://git.ti.com/graphics/img-pvr-sdk https://git.ti.com/cgit/graphics/img-pvr-sdk

View File

@ -1,2 +1,3 @@
# Locally computed: # Locally computed:
sha256 9d1d4da2c2b35303e239f99eb4003b8b206078a682aa083d5fb831ee4197f3bf ti-sgx-demos-f24650bc8243b25c23d6a0a502ed79fc472ac424.tar.gz sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz
sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt

View File

@ -4,14 +4,15 @@
# #
################################################################################ ################################################################################
# This correpsonds to SDK 02.00.00.00 # This correpsonds to SDK 06.00.00.07 plus one pull request
TI_SGX_DEMOS_VERSION = f24650bc8243b25c23d6a0a502ed79fc472ac424 TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287
TI_SGX_DEMOS_SITE = git://git.ti.com/graphics/img-pvr-sdk.git TI_SGX_DEMOS_SITE = http://git.ti.com/git/graphics/img-pvr-sdk.git
TI_SGX_DEMOS_SITE_METHOD = git
TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement
TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt
define TI_SGX_DEMOS_INSTALL_TARGET_CMDS define TI_SGX_DEMOS_INSTALL_TARGET_CMDS
cp -dpfr $(@D)/targetfs/Examples/Advanced/OGLES* \ cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/Wayland/OGLES* \
$(TARGET_DIR)/usr/bin/ $(TARGET_DIR)/usr/bin/
endef endef

View File

@ -8,46 +8,10 @@ config BR2_PACKAGE_TI_SGX_KM
select BR2_LINUX_NEEDS_MODULES select BR2_LINUX_NEEDS_MODULES
help help
Kernel modules for TI CPUs with SGX GPU. Kernel modules for TI CPUs with SGX GPU.
This package supports AM335x, AM437x, AM4430 and AM5430. This package supports AM335x only.
It builds the kernel module and the user space binaries. It builds the kernel module and the user space binaries.
For older CPUs or kernels use the ti-gfx package. For older CPUs or kernels use the ti-gfx package.
Note: it needs a TI specific kernel to build properly. Note: it needs a TI specific kernel to build properly.
http://git.ti.com/graphics/omap5-sgx-ddk-linux https://git.ti.com/cgit/graphics/omap5-sgx-ddk-linux
if BR2_PACKAGE_TI_SGX_KM
choice
prompt "Target"
default BR2_PACKAGE_TI_SGX_KM_AM335X if BR2_PACKAGE_TI_SGX_AM335X # legacy
default BR2_PACKAGE_TI_SGX_KM_AM437X if BR2_PACKAGE_TI_SGX_AM437X # legacy
default BR2_PACKAGE_TI_SGX_KM_AM4430 if BR2_PACKAGE_TI_SGX_AM4430 # legacy
default BR2_PACKAGE_TI_SGX_KM_AM5430 if BR2_PACKAGE_TI_SGX_AM5430 # legacy
default BR2_PACKAGE_TI_SGX_KM_AM335X
help
Select the SOC for which you would like to install drivers.
config BR2_PACKAGE_TI_SGX_KM_AM335X
bool "AM335x"
help
AM335x CPU
config BR2_PACKAGE_TI_SGX_KM_AM437X
bool "AM437x"
help
AM437x CPU
config BR2_PACKAGE_TI_SGX_KM_AM4430
bool "AM4430"
help
AM4430 CPU
config BR2_PACKAGE_TI_SGX_KM_AM5430
bool "AM5430"
help
AM5430 CPU
endchoice
endif

View File

@ -1,2 +1,3 @@
# Locally computed: # Locally computed:
sha256 47728ff8fc48827116cc042efa777a22a83dd4bd17c494e2a53b8c204ca59624 ti-sgx-km-2b7523d07a13ab704a24a7664749551f4a13ed32.tar.gz sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz
sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING

View File

@ -4,30 +4,23 @@
# #
################################################################################ ################################################################################
# This correpsonds to SDK 02.00.00.00 # This correpsonds to SDK 06.00.00.07
TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32 TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d
TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git
TI_SGX_KM_SITE_METHOD = git
TI_SGX_KM_LICENSE = GPL-2.0 TI_SGX_KM_LICENSE = GPL-2.0
TI_SGX_KM_LICENSE_FILES = GPL-COPYING TI_SGX_KM_LICENSE_FILES = eurasia_km/GPL-COPYING
TI_SGX_KM_DEPENDENCIES = linux TI_SGX_KM_DEPENDENCIES = linux
TI_SGX_KM_MAKE_OPTS = \ TI_SGX_KM_MAKE_OPTS = \
$(LINUX_MAKE_FLAGS) \ $(LINUX_MAKE_FLAGS) \
KERNELDIR=$(LINUX_DIR) \ KERNELDIR=$(LINUX_DIR) \
PVR_NULLDRM=1 TARGET_PRODUCT=$(TI_SGX_KM_PLATFORM_NAME)
ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y) TI_SGX_KM_PLATFORM_NAME = ti335x
TI_SGX_KM_PLATFORM_NAME = omap335x
else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y)
TI_SGX_KM_PLATFORM_NAME = omap437x
else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y)
TI_SGX_KM_PLATFORM_NAME = omap4430
else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y)
TI_SGX_KM_PLATFORM_NAME = omap5430
endif
TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/$(TI_SGX_KM_PLATFORM_NAME)_linux TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/omap_linux
define TI_SGX_KM_BUILD_CMDS define TI_SGX_KM_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \ $(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \

View File

@ -0,0 +1,39 @@
From afb92e4b1cd05388f519868215d0e8a4672ebb0e Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Sun, 10 Nov 2019 22:44:44 -0300
Subject: [PATCH] Makefile: do not install init script
Use a custom one, made for Buildroot, instead.
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Makefile b/Makefile
index 649111a..19016f3 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ TARGET_PRODUCT ?= jacinto6evm
SRCDIR = ./targetfs/${TARGET_PRODUCT}
prefix = /usr
-etcdir = /etc
bindir = ${prefix}/bin
incdir = ${prefix}/include
libdir = ${prefix}/lib
@@ -11,11 +10,9 @@ libdir = ${prefix}/lib
all:
install:
- mkdir -p ${DESTDIR}${etcdir}
mkdir -p ${DESTDIR}${bindir}
mkdir -p ${DESTDIR}${incdir}
mkdir -p ${DESTDIR}${libdir}
- cp -ar ${SRCDIR}/etc/* ${DESTDIR}${etcdir}
cp -ar ${SRCDIR}/bin/* ${DESTDIR}${bindir}
cp -ar ${SRCDIR}/include/* ${DESTDIR}${incdir}
cp -ar ${SRCDIR}/lib/* ${DESTDIR}${libdir}
--
2.18.1

View File

@ -1,13 +1,15 @@
comment "ti-sgx-um needs the ti-sgx-km driver" comment "ti-sgx-um needs the ti-sgx-km driver"
depends on !BR2_PACKAGE_TI_SGX_KM depends on !BR2_PACKAGE_TI_SGX_KM
comment "ti-sgx-um needs a glibc toolchain w/ threads" comment "ti-sgx-um needs udev and a glibc toolchain w/ threads"
depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC \
|| !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_TI_SGX_UM config BR2_PACKAGE_TI_SGX_UM
bool "ti-sgx-um" bool "ti-sgx-um"
depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_PACKAGE_TI_SGX_KM
depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
depends on BR2_PACKAGE_HAS_UDEV # ti-sgx-libgbm
# pre-built binaries # pre-built binaries
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM
@ -15,12 +17,15 @@ config BR2_PACKAGE_TI_SGX_UM
select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_HAS_POWERVR select BR2_PACKAGE_HAS_POWERVR
select BR2_PACKAGE_TI_SGX_LIBGBM
select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_WAYLAND
help help
Graphics libraries for TI CPUs with SGX5xx GPU. Graphics libraries for TI CPUs with SGX5xx GPU.
This package supports AM335x, AM437x, AM4430 and AM5430. This package supports AM335x, AM437x, AM4430 and AM5430.
For older CPUs or kernels use the ti-gfx package. For older CPUs or kernels use the ti-gfx package.
http://git.ti.com/graphics/omap5-sgx-ddk-um-linux https://git.ti.com/cgit/graphics/omap5-sgx-ddk-um-linux
if BR2_PACKAGE_TI_SGX_UM if BR2_PACKAGE_TI_SGX_UM

View File

@ -1,14 +1,56 @@
#!/bin/sh #!/bin/sh
pvrsrvkm_ko="/lib/modules/$(/bin/uname -r)/extra/pvrsrvkm.ko"
pvr_loaded() {
/sbin/lsmod | /bin/grep -q '^\<pvrsrvkm\>'
}
pvr_load() {
/sbin/insmod "$pvrsrvkm_ko" > /dev/null 2>&1
}
start() {
printf 'Loading pvrsrvkm module: '
pvr_loaded || pvr_load
status=$?
if [ "$status" -eq 0 ]; then
printf 'Starting PowerVR services: '
/usr/bin/pvrsrvctl --start --no-module > /dev/null 2>&1
status=$?
fi
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
stop() {
printf 'Starting PowerVR services: '
/usr/bin/pvrsrvctl --stop > /dev/null 2>&1
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
restart() {
stop
sleep 1
start
}
case "$1" in case "$1" in
start) start|stop|restart)
printf "Initializing SGX graphics driver " "$1";;
/usr/bin/pvrsrvinit reload)
[ $? = 0 ] && echo "OK" || echo "FAIL" restart;;
;; *)
stop) echo "Usage: $0 {start|stop|restart|reload}"
;; exit 1
*)
echo "Usage: $0 {start|stop}"
exit 1
;;
esac esac

View File

@ -1,6 +0,0 @@
[default]
#defaul library without double buffering:
WindowSystem=libpvrDRMWSEGL_FRONT.so
#alternative library, slower but with double buffering
#WindowSystem=libpvrDRMWSEGL.so
DisableHWTQTextureUpload=1

View File

@ -1,2 +1,3 @@
# Locally computed: # Locally computed:
sha256 c17f23d255cff8fe72fc3f5cae3d7550e387af07d036954b4f08e573379406d0 ti-sgx-um-e15f1543bab4de9e8927a2c4934addf3fd16ffcb.tar.gz sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz
sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc

View File

@ -4,28 +4,26 @@
# #
################################################################################ ################################################################################
# This correpsonds to SDK 02.00.00.00 # This correpsonds to SDK 06.00.00.07 plus one pull request
TI_SGX_UM_VERSION = e15f1543bab4de9e8927a2c4934addf3fd16ffcb TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8
TI_SGX_UM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git
TI_SGX_UM_SITE_METHOD = git
TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE = TI TSPA License
TI_SGX_UM_LICENSE_FILES = OMAP5-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc
TI_SGX_UM_INSTALL_STAGING = YES TI_SGX_UM_INSTALL_STAGING = YES
TI_SGX_UM_TARGET=ti335x
# ti-sgx-um is a egl/gles provider only if libdrm is installed # ti-sgx-um is a egl/gles provider only if libdrm is installed
TI_SGX_UM_DEPENDENCIES = libdrm TI_SGX_UM_DEPENDENCIES = libdrm wayland
define TI_SGX_UM_INSTALL_STAGING_CMDS define TI_SGX_UM_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) \
TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install
endef endef
define TI_SGX_UM_INSTALL_TARGET_CMDS define TI_SGX_UM_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) \
endef TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install
# libs use the following file for configuration
define TI_SGX_UM_INSTALL_CONF
$(INSTALL) -D -m 0644 package/ti-sgx-um/powervr.ini \
$(TARGET_DIR)/etc/powervr.ini
endef endef
TI_SGX_UM_POST_INSTALL_TARGET_HOOKS += TI_SGX_UM_INSTALL_CONF TI_SGX_UM_POST_INSTALL_TARGET_HOOKS += TI_SGX_UM_INSTALL_CONF