package/gcnano-binaries: Add STM32MP2 support and bump to 6.4.15

Add initial support for STM32MP257 GPU drivers.

gcnano-binaries will be configured for STM32MP1 platforms on ARM 32-bits
and STM32MP2 on ARM 64-bits.

Update to the latest version of the gcnano-binaries blobs, which are
compatible with the last v6.1-stm32mp-r2 kernel from the
STMicroelectronics BSP.

Signed-off-by: Romain Gantois <romain.gantois@bootlin.com>
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>

package/gcnano-binaries/Config.in

@@ -1,15 +1,15 @@
 comment "gcnano-binaries needs a Linux kernel to be built"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	depends on !BR2_LINUX_KERNEL
 
 comment "gcnano-binaries needs a glibc toolchain w/ threads, dynamic library"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS \
 		|| BR2_STATIC_LIBS
 
 config BR2_PACKAGE_GCNANO_BINARIES
 	bool "gcnano-binaries"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland

package/gcnano-binaries/gcnano-binaries.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  8bb1f6ee633f3c30e16b33ff6913286edf31f77b69105a14d147509beba3ea94  gcnano-binaries-5d02efd5cb4cfa85307633891f3cf87550a8bc1d.tar.gz
+sha256  4c7454ac44c9e3ead20a978a5c009e8489fa90ce5cf291be31016a7f497bea26  gcnano-binaries-bbaae49a0e4859ed53f898a250269c8a237261bc.tar.gz
 sha256  29c78804b097b5cfee0e802bef9f60348a635640eadd8a91b7ce82ddf17fbf5a  EULA

package/gcnano-binaries/gcnano-binaries.mk

@@ -4,11 +4,20 @@
 #
 ################################################################################
 
-GCNANO_BINARIES_LIB_VERSION = 6.4.13
+GCNANO_BINARIES_LIB_VERSION = 6.4.15
 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION)
-GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20230517
-GCNANO_BINARIES_VERSION = 5d02efd5cb4cfa85307633891f3cf87550a8bc1d
+
 GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION))
+GCNANO_BINARIES_VERSION = bbaae49a0e4859ed53f898a250269c8a237261bc
+ifeq ($(BR2_arm),y)
+GCNANO_BINARIES_USERLAND_VERSION = stm32mp1-$(GCNANO_BINARIES_LIB_VERSION)-20240206
+GCNANO_BINARIES_ARCH_TYPE = arm
+GCNANO_BINARIES_SOC_PLATFORM = st-mp1
+else
+GCNANO_BINARIES_USERLAND_VERSION = stm32mp2-$(GCNANO_BINARIES_LIB_VERSION)-20240517
+GCNANO_BINARIES_ARCH_TYPE = arm64
+GCNANO_BINARIES_SOC_PLATFORM = st-mp2
+endif
 
 GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms
 GCNANO_BINARIES_LICENSE_FILES = EULA
@@ -38,8 +47,9 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER
 GCNANO_BINARIES_MODULE_SUBDIRS = gcnano-driver-stm32mp
 
 GCNANO_BINARIES_MODULE_MAKE_OPTS = \
+	ARCH_TYPE=$(GCNANO_BINARIES_ARCH_TYPE) \
 	KERNEL_DIR=$(LINUX_DIR) \
-	SOC_PLATFORM=st-mp1 \
+	SOC_PLATFORM=$(GCNANO_BINARIES_SOC_PLATFORM) \
 	AQROOT=$(@D)/gcnano-driver-stm32mp \
 	DEBUG=0
 
@@ -58,7 +68,7 @@ define GCNANO_BINARIES_INSTALL
 	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
 	cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
 	for file in *.pc ; do \
-		sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|22.0.3|" $$file > $$file.temp ; \
+		sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|23.0.3|" $$file > $$file.temp ; \
 		$(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \
 	done
 endef