Skip to contentSkip to conversation

new package: ti-sgx/ti-sgx-libgbm libgbm for SGX graphics accelerator

RFC PATCH New Lothar Felten 3 participants 9 messages Oct 15, 2019 – Oct 16, 2019

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/4 new package: ti-sgx/ti-sgx-libgbm libgbm for SGX graphics accelerator

This package adds a custom ti version of libgbm required by the binary libraries of the ti-sgx/ti-sgx-um package.

---
 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 +++++++++++++++++++
 package/ti-sgx/ti-sgx-libgbm/Config.in        |  5 +++
 .../ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.hash   |  2 +
 package/ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.mk | 41 +++++++++++++++++++
 8 files changed, 109 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
 create mode 100644 package/ti-sgx/ti-sgx-libgbm/Config.in
 create mode 100644 package/ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.hash
 create mode 100644 package/ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.mk
package/Config.in +1 -0
index 3a4b1c33b..69cb35576 100644
@@ -538,6 +538,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
new file mode 100644
index 000000000..8b671cdcc
@@ -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
new file mode 100644
index 000000000..24427c811
@@ -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
new file mode 100644
index 000000000..d316a84e4
@@ -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

package/ti-sgx/ti-sgx-libgbm/Config.in new file +5 -0
new file mode 100644
index 000000000..24427c811
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_TI_SGX_LIBGBM
+        bool "libgbm, ti variant"
+        help
+	  TI SGX libgbm variant
+
package/ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.hash new file +2 -0
new file mode 100644
index 000000000..de4f442a9
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 ecf9848a5cdc46249b3bb6d1119118ab62e926e4826a1dcac6d927c247a26b57 ti-sgx-libgbm-cb86a2f2cecd41023bf1bf12fbcf11be11220f31.tar.gz
package/ti-sgx/ti-sgx-libgbm/ti-sgx-libgbm.mk new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

RFC PATCH 2/4 ti-sgx-*: bump to latest TI version

bump the ti-sgx-km,-um and -demos to the TI version that matches the TI SDK 06.00.00.07.

Removed all targets except AM335x.
powervr.ini is no longer used in the TI SDK, remove it too.

---
 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 +++++----------
 package/ti-sgx-um/Config.in            |  2 ++
 package/ti-sgx-um/powervr.ini          |  6 -----
 package/ti-sgx-um/ti-sgx-um.hash       |  2 +-
 package/ti-sgx-um/ti-sgx-um.mk         | 17 +++++-------
 9 files changed, 23 insertions(+), 73 deletions(-)
 delete mode 100644 package/ti-sgx-um/powervr.ini
package/ti-sgx-demos/ti-sgx-demos.hash +1 -1
index 43acf9102..c99e2499c 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 9d1d4da2c2b35303e239f99eb4003b8b206078a682aa083d5fb831ee4197f3bf ti-sgx-demos-f24650bc8243b25c23d6a0a502ed79fc472ac424.tar.gz
+sha256 c7238342e3eab4698cf81a65e001ffe91d27fc10129250a6fef380abb5440ad0 ti-sgx-demos-e76ae77b27ef570e7b8494c3d7067fd3d72b5976.tar.gz
package/ti-sgx-demos/ti-sgx-demos.mk +3 -3
index 80af79b98..27418e66a 100644
@@ -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
+TI_SGX_DEMOS_VERSION = e76ae77b27ef570e7b8494c3d7067fd3d72b5976
 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
index 348efdeb8..1e49a538f 100644
@@ -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
index 7f7e0acd4..2bb5e55f6 100644
@@ -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
index 0e1bc3390..6e1f3fa40 100644
@@ -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/Config.in +2 -0
index 8e1e4fb27..b9cbd143b 100644
@@ -15,6 +15,8 @@ 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
 	help
 	  Graphics libraries for TI CPUs with SGX5xx GPU.
 	  This package supports AM335x, AM437x, AM4430 and AM5430.
package/ti-sgx-um/powervr.ini deleted +0 -6
deleted file mode 100644
index fc92d45d5..000000000
@@ -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
index a6a056646..10c23374f 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 c17f23d255cff8fe72fc3f5cae3d7550e387af07d036954b4f08e573379406d0 ti-sgx-um-e15f1543bab4de9e8927a2c4934addf3fd16ffcb.tar.gz
+sha256 592ecafab76b67a86174fd87dbf0302a4b3a620eaa0e5a2872fbf6e9a33eec69 ti-sgx-um-87d7e5c1e4db1bab048939c9719059d549c1e8dd.tar.gz
package/ti-sgx-um/ti-sgx-um.mk +7 -10
index d5c50a016..f4397e30d 100644
@@ -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
+TI_SGX_UM_VERSION = 87d7e5c1e4db1bab048939c9719059d549c1e8dd
 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
 
 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.17.1
#2 lore raw

RFC PATCH 2/4 ti-sgx-*: bump to latest TI version

Quoted 5 lines · Lothar Felten

bump the ti-sgx-km,-um and -demos to the TI version that matches the TI SDK 06.00.00.07.

Removed all targets except AM335x.
powervr.ini is no longer used in the TI SDK, remove it too.

So TI provides no SDK any more for any other CPU with PowerVR? This is a bit
annoying... If there are any users out there with such a system, they won't be able to build with Buildroot any more.

Well, they can always take the old ti-sgx-km package in a BR2_EXTERNAL, I guess...

Peter, Thomas, opinions?

Regards,
Arnout

#3 lore raw

RFC PATCH 2/4 ti-sgx-*: bump to latest TI version

In reply to Lothar Felten

Hello,

Quoted 4 lines · On Tue, 15 Oct 2019 23:30:59 +0200 Lothar Felten <[email protected]>…

bump the ti-sgx-km,-um and -demos to the TI version that matches the TI SDK 06.00.00.07.

Removed all targets except AM335x.

Are you sure about this ? I've briefly browsed through the commits 2b7523d07a13ab704a24a7664749551f4a13ed32..4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d in ti-sgx-km, and I don't see anything about removing support for platforms.

However indeed there used to be a per-platform directory in eurasia_km/eurasiacon/build/linux2/:

omap437x_linux
omap5430_linux
omap335x_linux
omap4430_linux

But it has now been replaced by a single folder omap_linux, in commit 5f8570e190b37e534c9195728812190ec999c9d5, which says:

commit 5f8570e190b37e534c9195728812190ec999c9d5

Author: Eric Ruei <[email protected]>
Date:   Fri Feb 22 12:42:58 2019 -0500

km: Makefile cleanup

This patch simplifies the omap makefile to improve readability. The makefile is used to build DRM-based SGX user modules for K4.x and AM3/4/5/6 SoC only and therefore there is no need to keep the unused environment variables and conditions in history.
- Remove unsupported targets
- Remove unused environment variables
- Remove unused and/or dead conditions

There are still tests for various TARGET_PRODUCT values:

eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter omap5uevm jacinto6evm,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter ti654x,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter ti335x ti437x,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile: ifeq ($(TARGET_PRODUCT), ti437x)

Could you clarify why you think there is only support for AM335x left ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

RFC PATCH 2/4 ti-sgx-*: bump to latest TI version

Hello,

Quoted 56 lines · Thomas Petazzoni

Hello,

Quoted 4 lines · On Tue, 15 Oct 2019 23:30:59 +0200 Lothar Felten <[email protected]>…

bump the ti-sgx-km,-um and -demos to the TI version that matches the TI SDK 06.00.00.07.

Removed all targets except AM335x.

Are you sure about this ? I've briefly browsed through the commits 2b7523d07a13ab704a24a7664749551f4a13ed32..4519ed3b83d1d72207ddc2874c7 eb5e5a7f20d8d
in ti-sgx-km, and I don't see anything about removing support for platforms.

However indeed there used to be a per-platform directory in eurasia_km/eurasiacon/build/linux2/:

omap437x_linux
omap5430_linux
omap335x_linux
omap4430_linux

But it has now been replaced by a single folder omap_linux, in commit 5f8570e190b37e534c9195728812190ec999c9d5, which says:

commit 5f8570e190b37e534c9195728812190ec999c9d5

Author: Eric Ruei <[email protected]>
Date:   Fri Feb 22 12:42:58 2019 -0500

km: Makefile cleanup

This patch simplifies the omap makefile to improve readability. The makefile is used to build DRM-based SGX user modules for K4.x
and
AM3/4/5/6 SoC only and therefore there is no need to keep the
unused
environment variables and conditions in history.
- Remove unsupported targets
- Remove unused environment variables
- Remove unused and/or dead conditions

There are still tests for various TARGET_PRODUCT values:

eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter omap5uevm jacinto6evm,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter ti654x,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile:ifneq ($(filter ti335x ti437x,$(TARGET_PRODUCT)),) eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile: ifeq ($(TARGET_PRODUCT), ti437x)

Quoted 2 lines

Could you clarify why you think there is only support for AM335x left ?

Sorry the message was misleading, I meant to say: currently the buildroot package only supports the target am335x.

The support for the other boards can be added by selecting the correct TARGET_PRODUCT/TI_SGX_UM_TARGET as you stated.

Those patches are preliminary as the goal to build qt5 with sgx acceleration still needs some work. I just modified the package so it builds at least for AM335x. The other targets need at least menu entries for the variable, maybe more.

Best regards,
Lothar

Quoted 4 lines

Best regards,

Thomas

#5 lore raw

RFC PATCH 3/4 configs/beaglebone_qt5: bump kernel and uboot version, add weston

In reply to Lothar Felten

update to TI SDK 06.00.00.07 Linux kernel version 4.19 update u-boot to 2019.07

packages: select weston and qt5wayland
rename kernel fragment file

---
 ...nux-4.1-sgx.fragment => linux-sgx.fragment} |  1 +
 configs/beaglebone_qt5_defconfig               | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 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
similarity index 92%
rename from board/beaglebone/linux-4.1-sgx.fragment
rename to board/beaglebone/linux-sgx.fragment
index c0d2e7b28..58d46f588 100644
@@ -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 +10 -8
index fb61bf54d..7029e66a8 100644
@@ -1,36 +1,38 @@
 BR2_arm=y
 BR2_cortex_a8=y
 BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_5_X=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_REPO_VERSION="4dae378bbe721277b08699d1d88ffae12acc9b09"
 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
Signature · 1 line
2.17.1
#6 lore raw

RFC PATCH 4/4 package/qt5/qt5base: support ti-sgx-libgbm

In reply to Lothar Felten

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
index e4aa76908..0caa57000 100644
@@ -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.17.1
#7 lore raw

RFC PATCH 4/4 package/qt5/qt5base: support ti-sgx-libgbm

Quoted 12 lines · Lothar Felten

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 +0 -0
index e4aa76908..0caa57000 100644

package/qt5/qt5base/qt5base.mk else · line 81

Quoted 9 lines
package/qt5/qt5base/qt5base.mk +2 -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)

I would swap the two so TI gets priority if both are selected.

Note that there was also talk about making gbm a virtual package (with
currently mesa3d and ti-sgx-libgbm as providers). IIRC, though, the TI gbm package was not 100% compatible. But apparently it's good enough to build qt5 then?

And what about waffle and mesa3d-demos?

Note that we don't require you to figure all of this out before we can apply
these patches. But maybe you know a little bit more about it.

Regards,
Arnout

Quoted 6 lines
package/qt5/qt5base/qt5base.mk +2 -0
+QT5BASE_CONFIGURE_OPTS += -gbm
+QT5BASE_DEPENDENCIES += ti-sgx-libgbm
 else
 QT5BASE_CONFIGURE_OPTS += -no-gbm
 endif
#8 lore raw

RFC PATCH 4/4 package/qt5/qt5base: support ti-sgx-libgbm

Hello,

Quoted 3 lines · On Wed, 16 Oct 2019 01:00:37 +0200 Arnout Vandecappelle <[email protected]> wrote:

Note that there was also talk about making gbm a virtual package (with
currently mesa3d and ti-sgx-libgbm as providers). IIRC, though, the TI gbm package was not 100% compatible. But apparently it's good enough to build qt5 then?

I tried to make libgbm a virtual package, but unfortunately my conclusion was that the libgbm API is not really standardized. When I tried to build kmscube against the TI gbm, it would fail miserably, and it was also failing with another non-mesa GBM implementation.

I pushed what I had back then at
https://github.com/tpetazzoni/buildroot/commits/gbm.

Quoted 2 lines

Note that we don't require you to figure all of this out before we can apply
these patches. But maybe you know a little bit more about it.

Yes, let's not make this depend on having a virtual package for libgbm. We can figure that out later.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com