fix beaglebone_qt5
v2 cover fix beaglebone_qt5
From: Carlos Santos <[email protected]>
Fix some issues in Lothar's initial patch.
Add a patch dropping the custom post-image script.
Carlos Santos (1):
configs/beaglebone_qt5: don't use custom post-image script
Lothar Felten (4):
package/ti-sgx-libgbm: new package package/ti-sgx-{km,um,demos}: bump to latest TI version package/qt5/qt5base: support ti-sgx-libgbm configs/beaglebone_qt5: bump kernel and U-Boot, add weston
...ux-4.1-sgx.fragment => linux-sgx.fragment} | 1 +
board/beaglebone/post-image.sh | 29 ---------
configs/beaglebone_qt5_defconfig | 27 ++++----
package/Config.in | 1 +
package/qt5/qt5base/qt5base.mk | 5 +-
package/ti-sgx-demos/ti-sgx-demos.hash | 2 +-
package/ti-sgx-demos/ti-sgx-demos.mk | 6 +-
package/ti-sgx-km/Config.in | 37 +----------
package/ti-sgx-km/ti-sgx-km.hash | 2 +-
package/ti-sgx-km/ti-sgx-km.mk | 22 ++-----
.../0001_fix_sysmacro_include.patch | 12 ++++
package/ti-sgx-libgbm/Config.in | 5 ++
package/ti-sgx-libgbm/ti-sgx-libgbm.hash | 2 +
package/ti-sgx-libgbm/ti-sgx-libgbm.mk | 41 ++++++++++++
...-Makefile-do-not-install-init-script.patch | 39 +++++++++++
package/ti-sgx-um/Config.in | 3 +
package/ti-sgx-um/S80ti-sgx | 64 +++++++++++++++----
package/ti-sgx-um/powervr.ini | 6 --
package/ti-sgx-um/ti-sgx-um.hash | 2 +-
package/ti-sgx-um/ti-sgx-um.mk | 19 +++---
20 files changed, 199 insertions(+), 126 deletions(-)
rename board/beaglebone/{linux-4.1-sgx.fragment => linux-sgx.fragment} (92%)
delete mode 100755 board/beaglebone/post-image.sh
create mode 100644 package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch
create mode 100644 package/ti-sgx-libgbm/Config.in
create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.hash
create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.mk
create mode 100644 package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch
delete mode 100644 package/ti-sgx-um/powervr.iniSignature · 1 line
2.18.1
PATCH v2 1/5 package/ti-sgx-libgbm: new package
From: Lothar Felten <[email protected]>
A custom ti version of libgbm for SGX graphics accelerator, required by the binary libraries of the ti-sgx-um package.
---
Changes v1->v2
- Fix SDK version (comment in ti-sgx-libgbm.mk)
- Remove duplicate package in package/ti-sgx/ti-sgx-libgbm
package/ti-sgx-libgbm
package/ti-sgx
--- package/Config.in | 1 + .../0001_fix_sysmacro_include.patch | 12 ++++++ package/ti-sgx-libgbm/Config.in | 5 +++ package/ti-sgx-libgbm/ti-sgx-libgbm.hash | 2 + package/ti-sgx-libgbm/ti-sgx-libgbm.mk | 41 +++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch create mode 100644 package/ti-sgx-libgbm/Config.in create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.hash create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.mk
package/Config.in +1 -0
@@ -541,6 +541,7 @@ endmenu source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" + source "package/ti-sgx-libgbm/Config.in" source "package/ti-uim/Config.in" source "package/ti-utils/Config.in" source "package/triggerhappy/Config.in"
package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff --git a/gbm.c b/gbm.c +index c046b1a..a8660c8 100644 +--- a/gbm.c ++++ b/gbm.c +@@ -36,6 +36,7 @@ + + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <unistd.h> + #include <errno.h> +
package/ti-sgx-libgbm/Config.in new file +5 -0
@@ -0,0 +1,5 @@ +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "libgbm, ti variant" + help + TI SGX libgbm variant +
package/ti-sgx-libgbm/ti-sgx-libgbm.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed: +sha256 7be13eed8c357da8060f3db52de48ad8e76bf4784e8b2979f19ddc3bb725ca45 ti-sgx-libgbm-f316cf4b98ca3f4a1ca92a48ddd8aa559894a45c.tar.gz
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.1
PATCH v2 1/5 package/ti-sgx-libgbm: new package
Carlos, Lothar, All,
On 2019-11-14 09:42 -0300, unixmania at gmail.com spake thusly:
Quoted 8 lines
From: Lothar Felten <[email protected]>
A custom ti version of libgbm for SGX graphics accelerator, required by the binary libraries of the ti-sgx-um package.
Signed-off-by Lothar Felten <[email protected]>Signed-off-by Carlos Santos <[email protected]>---
[--SNIP--]
We'd need an entry in the DEVELOPPERS file too, please.
package/ti-sgx-libgbm/Config.in line 2
Quoted 8 lines
package/ti-sgx-libgbm/Config.in new file +2
-0@@ -0,0 +1,5 @@ +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "libgbm, ti variant"
We usually just have the prompt repeat just the name of the package, hence:
bool "ti-sgx-libgbm"
package/ti-sgx-libgbm/Config.in line 4
Quoted 2 lines
package/ti-sgx-libgbm/Config.in new file +2
-0+ help + TI SGX libgbm variant
Indentation is wrong: run 'make check-package' to get the details and hints on how to fix it.
package/ti-sgx-libgbm/ti-sgx-libgbm.hash line 2
Quoted 8 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed: +sha256 7be13eed8c357da8060f3db52de48ad8e76bf4784e8b2979f19ddc3bb725ca45 ti-sgx-libgbm-f316cf4b98ca3f4a1ca92a48ddd8aa559894a45c.tar.gz
Please also add a hash for the license file (gbm.h).
Quoted 6 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +0
-0
package/ti-sgx-libgbm/ti-sgx-libgbm.mk line 8
Quoted 8 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +8
-0@@ -0,0 +1,41 @@ +################################################################################ +# +# ti-sgx-libgbm +# +################################################################################ + +# This correpsonds to SDK 06.00.00.07 +TI_SGX_LIBGBM_VERSION = f316cf4b98ca3f4a1ca92a48ddd8aa559894a45c
There is a newer commit now...
package/ti-sgx-libgbm/ti-sgx-libgbm.mk line 9
Quoted 1 line
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +1
-0+TI_SGX_LIBGBM_SITE = git://git.ti.com/glsdk/libgbm.git
Please use the https-based URI visible on the upstream website:
https://git.ti.com/gitweb?p=glsdk/libgbm.git;a=summary
https://git.ti.com/git/glsdk/libgbm.git
package/ti-sgx-libgbm/ti-sgx-libgbm.mk line 18
Quoted 9 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +9
-0+TI_SGX_LIBGBM_LICENSE = MIT License +TI_SGX_LIBGBM_LICENSE_FILES = gbm.h +TI_SGX_LIBGBM_INSTALL_STAGING = YES + +TI_SGX_LIBGBM_DEPENDENCIES = libdrm udev + +# This package uses autoconf, but not automake, so we need to call +# their special autogen.sh script, and have custom target and staging +# installation commands.
I fail to see what the problem is. The autogen.sh basically does just;
autoreconf -v --install
which is basically what we would do with TI_SGX_LIBGBM_AUTORECONF = YES
If that does not work, then please expand the commit log to explain the problem.
package/ti-sgx-libgbm/ti-sgx-libgbm.mk line 31
Quoted 12 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +12
-0+define TI_SGX_LIBGBM_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +TI_SGX_LIBGBM_PRE_CONFIGURE_HOOKS += TI_SGX_LIBGBM_RUN_AUTOGEN + +define TI_SGX_LIBGBM_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(TARGET_DIR) \ + install +endef
Would it not be possible to keep using the standard install commands, and just set:
TI_SGX_LIBGBM_INSTALL_STAGING_OPTS = \
PREFIX=/usr STRIP=/bin/true \
DESTDIR=$(TARGET_DIR) \
installpackage/ti-sgx-libgbm/ti-sgx-libgbm.mk line 39
Quoted 7 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +7
-0+define TI_SGX_LIBGBM_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(STAGING_DIR) \ + install +endef
Ditto with DESTDIR set to staging?
Regards,
Yann E. MORIN.
Quoted 8 lines
package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +1
-0+$(eval $(autotools-package))Signature · 6 lines
2.18.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 2/5 package/ti-sgx-{km, um, demos}: bump to latest TI version
In reply to unixmania at gmail.comFrom: Lothar Felten <[email protected]>
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.
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.
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.
---
Changes v1->v2:
- Do not install the init script provided by TI.
- Bump ti-sgx-um for EGL/GLES headers for qt5base, or else it breaks:
qeglfskmsgbmintegration.cpp: In member function ?virtual void* QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType)?:
qeglfskmsgbmintegration.cpp:85:60: error: invalid conversion from ?EGLNativeDisplayType? {aka ?int?} to ?void*? [-fpermissive]
display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr);
- Bump ti-sgx-demos to match ti-sgx-um
- Select/depend on wayland (or else packages depending on ti-sgx-um fail to build due to missing libwayland-server).
- Update the init script
- Update commit message
--- package/ti-sgx-demos/ti-sgx-demos.hash | 2 +- package/ti-sgx-demos/ti-sgx-demos.mk | 6 +- package/ti-sgx-km/Config.in | 37 +---------- package/ti-sgx-km/ti-sgx-km.hash | 2 +- package/ti-sgx-km/ti-sgx-km.mk | 22 ++----- ...-Makefile-do-not-install-init-script.patch | 39 +++++++++++ package/ti-sgx-um/Config.in | 3 + package/ti-sgx-um/S80ti-sgx | 64 +++++++++++++++---- package/ti-sgx-um/powervr.ini | 6 -- package/ti-sgx-um/ti-sgx-um.hash | 2 +- package/ti-sgx-um/ti-sgx-um.mk | 19 +++--- 11 files changed, 117 insertions(+), 85 deletions(-) create mode 100644 package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch delete mode 100644 package/ti-sgx-um/powervr.ini
package/ti-sgx-demos/ti-sgx-demos.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed: -sha256 9d1d4da2c2b35303e239f99eb4003b8b206078a682aa083d5fb831ee4197f3bf ti-sgx-demos-f24650bc8243b25c23d6a0a502ed79fc472ac424.tar.gz +sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz
package/ti-sgx-demos/ti-sgx-demos.mk +3 -3
@@ -4,14 +4,14 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_DEMOS_VERSION = f24650bc8243b25c23d6a0a502ed79fc472ac424 +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287 TI_SGX_DEMOS_SITE = git://git.ti.com/graphics/img-pvr-sdk.git TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt 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/ endef
package/ti-sgx-km/Config.in +1 -36
@@ -8,7 +8,7 @@ config BR2_PACKAGE_TI_SGX_KM select BR2_LINUX_NEEDS_MODULES help 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. For older CPUs or kernels use the ti-gfx package.
@@ -16,38 +16,3 @@ config BR2_PACKAGE_TI_SGX_KM http://git.ti.com/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
package/ti-sgx-km/ti-sgx-km.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed: -sha256 47728ff8fc48827116cc042efa777a22a83dd4bd17c494e2a53b8c204ca59624 ti-sgx-km-2b7523d07a13ab704a24a7664749551f4a13ed32.tar.gz +sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz
package/ti-sgx-km/ti-sgx-km.mk +7 -15
@@ -4,8 +4,8 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32 +# This correpsonds to SDK 06.00.00.07 +TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_LICENSE = GPL-2.0 TI_SGX_KM_LICENSE_FILES = GPL-COPYING
@@ -15,19 +15,11 @@ TI_SGX_KM_DEPENDENCIES = linux TI_SGX_KM_MAKE_OPTS = \ $(LINUX_MAKE_FLAGS) \ KERNELDIR=$(LINUX_DIR) \ - PVR_NULLDRM=1 - -ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y) -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 + TARGET_PRODUCT=$(TI_SGX_KM_PLATFORM_NAME) + +TI_SGX_KM_PLATFORM_NAME = ti335x + +TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/omap_linux define TI_SGX_KM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \
package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch new file +39 -0
@@ -0,0 +1,39 @@ +From afb92e4b1cd05388f519868215d0e8a4672ebb0e Mon Sep 17 00:00:00 2001 +From: Carlos Santos <[email protected]> +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 <[email protected]> +--- + 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 +
package/ti-sgx-um/Config.in +3 -0
@@ -15,6 +15,9 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR + select BR2_PACKAGE_TI_SGX_LIBGBM + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_WAYLAND help Graphics libraries for TI CPUs with SGX5xx GPU. This package supports AM335x, AM437x, AM4430 and AM5430.
package/ti-sgx-um/S80ti-sgx +53 -11
67 lines not on this page · raw message
package/ti-sgx-um/powervr.ini deleted +0 -6
@@ -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
package/ti-sgx-um/ti-sgx-um.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed: -sha256 c17f23d255cff8fe72fc3f5cae3d7550e387af07d036954b4f08e573379406d0 ti-sgx-um-e15f1543bab4de9e8927a2c4934addf3fd16ffcb.tar.gz +sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz
package/ti-sgx-um/ti-sgx-um.mk +8 -11
@@ -4,28 +4,25 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_UM_VERSION = e15f1543bab4de9e8927a2c4934addf3fd16ffcb +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 TI_SGX_UM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = OMAP5-Linux-Graphics-DDK-UM-Manifest.doc 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_DEPENDENCIES = libdrm +TI_SGX_UM_DEPENDENCIES = libdrm wayland 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 define TI_SGX_UM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install -endef - -# 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 + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) \ + TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install endef TI_SGX_UM_POST_INSTALL_TARGET_HOOKS += TI_SGX_UM_INSTALL_CONF
Signature · 1 line
2.18.1
PATCH v2 3/5 package/qt5/qt5base: support ti-sgx-libgbm
In reply to unixmania at gmail.comFrom: Lothar Felten <[email protected]>
qt5 configure options: add ti-sgx-libgbm as GBM backend
--- package/qt5/qt5base/qt5base.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +4 -1
@@ -74,10 +74,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-kms endif -# Uses libgbm from mesa3d +# Uses libgbm from mesa3d or ti-sgx-libgbm ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += mesa3d +else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += ti-sgx-libgbm else QT5BASE_CONFIGURE_OPTS += -no-gbm endif
Signature · 1 line
2.18.1
PATCH v2 4/5 configs/beaglebone_qt5: bump kernel and U-Boot, add weston
In reply to unixmania at gmail.comFrom: Lothar Felten <[email protected]>
- Use the same kernel repository and version as configs/beaglebone
- Rename kernel fragment file
- Update U-Boot to 2019.07
- Select weston and qt5wayland
- Select host-uboot-tools with FIT support, required to create the images.
---
Changes v1->v2:
- Switch kernel source URL to BeagleBoard repository
- Select host-uboot-tools
- Update commit message
---
...ux-4.1-sgx.fragment => linux-sgx.fragment} | 1 +
configs/beaglebone_qt5_defconfig | 23 +++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
rename board/beaglebone/{linux-4.1-sgx.fragment => linux-sgx.fragment} (92%)board/beaglebone/linux-sgx.fragment renamed from board/beaglebone/linux-4.1-sgx.fragment +1 -0
@@ -10,3 +10,4 @@ CONFIG_DRM_OMAP_WB_M2M=y CONFIG_DRM_TILCDC=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM=y +CONFIG_DRM_LEGACY=y
configs/beaglebone_qt5_defconfig +13 -10
@@ -1,36 +1,37 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_GCC_VERSION_5_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52c4aa7cdb93d61f8008f380135beaf7b8fa6593" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1-sgx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_EGLFS=y +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland" BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_QT5WAYLAND=y +BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y +BR2_PACKAGE_WESTON=y BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="124M" +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set
@@ -42,3 +43,5 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
Signature · 1 line
2.18.1
PATCH v2 5/5 configs/beaglebone_qt5: don't use custom post-image script
In reply to unixmania at gmail.comFrom: Carlos Santos <[email protected]>
Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root.
Use a post-build script to copy uEnv.txt to BINARIES_DIR, as made for beaglebone.
Drop the post-image script.
--- board/beaglebone/post-image.sh | 29 ----------------------------- configs/beaglebone_qt5_defconfig | 4 +++- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100755 board/beaglebone/post-image.sh
board/beaglebone/post-image.sh deleted +0 -29
@@ -1,29 +0,0 @@ -#!/bin/sh -# post-image.sh for CircuitCo BeagleBone and TI am335x-evm -# 2014, Marcin Jabrzyk <[email protected]> -# 2016, Lothar Felten <[email protected]> - -BOARD_DIR="$(dirname $0)" - -# copy the uEnv.txt to the output/images directory -cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt - -# the 4.1 kernel does not provide a dtb for beaglebone green, so we -# use a different genimage config if am335x-bonegreen.dtb is not -# built: -if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then - GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -else - GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg" -fi - -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}"
configs/beaglebone_qt5_defconfig +3 -1
@@ -5,7 +5,9 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz"
Signature · 1 line
2.18.1