Skip to contentSkip to conversation

package/rpi-userland: add support for aarch64

PATCH Applied Tim Gover 2 participants 2 messages Nov 1, 2022 – Nov 22, 2022

lore
Share & tools
lore

Tim Gover

author
#0 lore raw

PATCH 1/1 package/rpi-userland: add support for aarch64

Enable aarch64 support for rpi-userland to provide vcmailbox and vcgencmd in 64bit builds. The are useful for programming OTP and system debug.

The ARM64=ON parameter restricts the make targets to only include those supported on 64-bit i.e. it excludes the legacy Broadcom EGL drivers.

---
 package/rpi-userland/Config.in       | 14 +++++++-------
 package/rpi-userland/rpi-userland.mk |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
package/rpi-userland/Config.in +7 -7
index 342faf26e3..cfb472808b 100644
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_RPI_USERLAND
 	bool "rpi-userland"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_HAS_LIBOPENVG
-	select BR2_PACKAGE_HAS_LIBOPENMAX
+	select BR2_PACKAGE_HAS_LIBEGL if BR2_arm
+	select BR2_PACKAGE_HAS_LIBGLES if BR2_arm
+	select BR2_PACKAGE_HAS_LIBOPENVG if BR2_arm
+	select BR2_PACKAGE_HAS_LIBOPENMAX if BR2_arm
 	help
 	  Raspberry Pi Userland contains the necessary library to use
 	  the VideoCore driver.
@@ -18,7 +18,7 @@ config BR2_PACKAGE_RPI_USERLAND
 
 	  https://github.com/raspberrypi/userland/
 
-if BR2_PACKAGE_RPI_USERLAND
+if BR2_PACKAGE_RPI_USERLAND && BR2_arm
 
 config BR2_PACKAGE_PROVIDES_LIBEGL
 	default "rpi-userland"
@@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO
 endif
 
 comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_arch64
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		BR2_STATIC_LIBS
package/rpi-userland/rpi-userland.mk +6 -0
index 1204196e19..42c7e8190f 100644
@@ -11,12 +11,18 @@ RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
 RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr
 
+ifeq ($(BR2_arm),y)
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
+endif
 
 ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
 RPI_USERLAND_DEPENDENCIES += libexecinfo
 endif
 
+ifeq ($(BR2_aarch64),y)
+RPI_USERLAND_CONF_OPTS += -DARM64=ON
+endif
+
 ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y)
 
 RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · On Tue, 1 Nov 2022 09:30:07 +0000 Tim Gover <[email protected]> wrote:

Enable aarch64 support for rpi-userland to provide vcmailbox and vcgencmd in 64bit builds. The are useful for programming OTP and system debug.

The ARM64=ON parameter restricts the make targets to only include those supported on 64-bit i.e. it excludes the legacy Broadcom EGL drivers.

Quoted 5 lines
---
 package/rpi-userland/Config.in       | 14 +++++++-------
 package/rpi-userland/rpi-userland.mk |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

Applied to next, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot