Merge branch 'next'

2025-12-12 08:23:49 +01:00
parent 6ddb75786e dc69440be9
commit 148cd0c3c1
337 changed files with 2957 additions and 2952 deletions
@@ -290,7 +290,6 @@ package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch lib_patch.Sob lib_patch.Upst
 package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch lib_patch.Sob lib_patch.Upstream
 package/curlftpfs/0003-nocache-memleak-fix.patch lib_patch.Sob lib_patch.Upstream
 package/curlftpfs/0004-fix-musl-build-off-t.patch lib_patch.Upstream
-package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch lib_patch.Upstream
 package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch lib_patch.Upstream
 package/cwiid/0002-configure-make-wmgui-build-optional.patch lib_patch.Upstream
 package/dahdi-tools/0001-no-build-docs.patch lib_patch.Upstream
@@ -403,7 +402,6 @@ package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream
 package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream
 package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream
 package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream
-package/gcr/0001-meson-Fix-unknown-kw-argument-in-gnome.generate_gir.patch lib_patch.Upstream
 package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream
 package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream
 package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream
@@ -445,7 +443,6 @@ package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream
 package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream
 package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream
-package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream
 package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream
 package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream
 package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream
@@ -533,7 +530,6 @@ package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream
 package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream
 package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream
 package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream
-package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch lib_patch.Upstream
 package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream
 package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream
 package/libdnet/0001-python-makefile.patch lib_patch.Upstream
@@ -840,8 +836,6 @@ package/pifmrds/0001-Makefile-cross-compile-friendly.patch lib_patch.Upstream
 package/pifmrds/0002-Makefile-use-LDFLAGS.patch lib_patch.Upstream
 package/pifmrds/0003-Makefile-fix-static-link.patch lib_patch.Upstream
 package/pigpio/S50pigpio Shellcheck lib_sysv.Variables
-package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch lib_patch.Upstream
-package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch lib_patch.Upstream
 package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch lib_patch.Upstream
 package/pkgconf/pkg-config.in Shellcheck
 package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream
@@ -144,6 +144,21 @@ endif

 ###############################################################################

+comment "Legacy options removed in 2026.02"
+
+config BR2_PACKAGE_MESA3D_VDPAU
+	bool "mesa3d Gallium VDPAU state tracker support removed"
+	select BR2_LEGACY
+	help
+	  Mesa3d removed the Gallium VDPAU state tracker.
+
+config BR2_BINUTILS_VERSION_2_42_X
+	bool "binutils 2.42 has been removed"
+	select BR2_LEGACY
+	help
+	  binutils 2.42 has been removed, select a newer version
+	  instead.
+
 comment "Legacy options removed in 2025.11"

 config BR2_KERNEL_HEADERS_5_4
@@ -1132,6 +1132,7 @@ F:	package/cpulimit/

 N:	Florian Larysch <fl@n621.de>
 F:	package/casync-nano/
+F:	package/sigsum-go/

 N:	Floris Bos <bos@je-eigen-domein.nl>
 F:	package/ipmitool/
@@ -2260,9 +2261,11 @@ N:	Marcus Hoffmann <bubu@bubu1.eu>
 F:	package/nethogs/
 F:	package/pico-sdk/
 F:	package/picotool/
+F:	package/python-annotated-doc/
 F:	package/python-apscheduler/
 F:	package/python-crc/
 F:	package/python-django/
+F:	package/python-gpiod/
 F:	package/python-immutabledict/
 F:	package/python-jc/
 F:	package/python-log-rate-limit/
@@ -2481,6 +2484,7 @@ F:	package/libgudev/

 N:	Neal Frager <neal.frager@amd.com>
 F:	board/versal/
+F:	board/versal2/
 F:	board/xilinx/
 F:	board/zynq/
 F:	board/zynqmp/
@@ -2489,6 +2493,7 @@ F:	boot/xilinx-prebuilt/
 F:	configs/versal_vck190_defconfig
 F:	configs/versal_vek280_defconfig
 F:	configs/versal_vpk180_defconfig
+F:	configs/versal2_vek385_defconfig
 F:	configs/zynq_zc702_defconfig
 F:	configs/zynq_zc706_defconfig
 F:	configs/zynqmp_kria_kd240_defconfig
@@ -1,6 +1,10 @@
 # Arm A-Profile Base RevC AEM FVP config
 bp.secure_memory=1
+bp.terminal_1.start_telnet=0
 bp.ve_sysregs.exit_on_shutdown=1
+bp.virtio_net.enabled=1
+bp.virtio_net.hostbridge.userNetworking=1
+bp.vis.rate_limit-enable=1
 cache_state_modelled=0
 cluster0.NUM_CORES=4
 cluster0.cpu0.enable_crc32=1
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22  arm-trusted-firmware-v2.11-git4.tar.gz
+sha256  a899100d9d92ceb1290fd4d61f5dd3b8af6b0e937cebc3c711cb514ac5acfaed  arm-trusted-firmware-v2.14.0-git4.tar.gz
@@ -1,2 +1,2 @@
-# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf  linux-6.10.12.tar.xz
+# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b  linux-6.18.tar.xz
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  464b3bf5bc4a61830357dbf81a0e5b89414d3bca1c2a752570cb0e40d2f1e637  optee-client-4.8.0.tar.gz
@@ -0,0 +1,34 @@
+From 1debd0c8bd46255f8c22b128ec16586ef9154869 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@arm.com>
+Date: Tue, 2 Dec 2025 15:53:23 +0100
+Subject: [PATCH] plat-vexpress: redirect console to uart0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For consistency with TF-A, U-Boot and Linux.
+
+Upstream: Not applicable. Buildroot specific.
+Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
+---
+ core/arch/arm/plat-vexpress/platform_config.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/arch/arm/plat-vexpress/platform_config.h b/core/arch/arm/plat-vexpress/platform_config.h
+index 9231f3048..76c7fdb36 100644
+--- a/core/arch/arm/plat-vexpress/platform_config.h
+++ b/core/arch/arm/plat-vexpress/platform_config.h
+@@ -23,8 +23,8 @@
+ 
+ #define IT_UART1		38
+ 
+-#define CONSOLE_UART_BASE	UART1_BASE
+-#define IT_CONSOLE_UART		IT_UART1
+#define CONSOLE_UART_BASE	UART0_BASE
+#undef IT_CONSOLE_UART
+ 
+ #elif defined(PLATFORM_FLAVOR_juno)
+ 
+-- 
+2.51.0
+
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  5222cd553f5edb69ae4ec7cb99b2bfec2c47a47c0be1865b49744701918e8b4d  optee-os-4.8.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
+sha256  b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a  u-boot-2025.10.tar.bz2
@@ -2,7 +2,7 @@ Introduction
 ============

 The arm_fvp_ebbr_defconfig is meant to illustrate some aspects of the Arm EBBR
-specification[1] and the Arm SystemReady IR[2] compliance program.
+specification[1] and the Arm SystemReady Devicetree band[2].
 It allows building an AArch64 U-Boot based firmware implementing the subset of
 UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run
 on the Arm A-Profile Base RevC AEM FVP.
@@ -26,8 +26,8 @@ Running on the FVP
 Download the FVP from one of the following sources, corresponding to your host
 computer:

- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz
- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz
+- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.30/FVP_Base_RevC-2xAEMvA_11.30_27_Linux64.tgz
+- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.30/FVP_Base_RevC-2xAEMvA_11.30_27_Linux64_armv8l.tgz

 The FVP will be located under one of the corresponding folders:

@@ -53,21 +53,58 @@ supporting the EBBR specification.
 To run another OS on simulation using a live or pre-installed image, use the
 same FVP command line as for the generated OS but adapt the OS image path in the
 virtioblockdevice stanza.
-The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are
-examples of pre-installed OS images.
-Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide a
-pre-installed OS image.
+The image generated by the aarch64_efi_defconfig or the Arm ACS Devicetree
+images[3] are examples of pre-installed OS images.
+Linux distributions such as Debian, Fedora, openSUSE or Ubuntu, or FreeBSD
+provide live or pre-installed OS image.
+
+Firmware details
+================
+
+Noteworthy firmware features:
+
+- TF-A, OP-TEE & U-Boot
+- UEFI, with EFI variables stored on disk in the ESP
+- Support for ethernet, RTC and LCD
+
+Architecture diagram:
+
+                 Non-Secure          :   Secure
+                                     :
+       +---------------------------+ :
+  EL0  |          Busybox          | :
+       +---------------------------+ : +--------+
+  EL1  |           Linux           | : | OP-TEE |  S-EL1
+       +---------------------------+ : +--------+
+  EL2  | U-Boot, GRUB, Linux (kvm) | :
+       +---------------------------+ :
+  ...................................:
+       +----------------------------------------+
+       |                   TF-A                 |  EL3
+       +----------------------------------------+
+
+Boot flow:
+
+  TF-A -+-> OP-TEE
+        `-> U-Boot -> GRUB -> Linux -> Busybox
+
+TF-A BL1 loads the fit image with the remaining pieces of TF-A, OP-TEE and
+U-Boot.
+OP-TEE boots, calls back TF-A to go to normal world.
+U-Boot loads GRUB with UEFI, boots Linux at EL2.
+
+In this configuration, the Devicetree is static and fully contained in TF-A.

 Miscellaneous
 =============

 This configuration is inspired by the arm_foundationv8_defconfig, the
-qemu_aarch64_virt_defconfig and the Arm SystemReady IR IoT Integration, Test,
-and Certification Guide[4].
+qemu_aarch64_virt_defconfig and the Arm SystemReady Devicetree Band Integration
+and Testing Guide[4].

-Firmware update, MMC and network are currently not supported.
+Firmware update, GOP, MMC and RNG are currently not supported.

-[1]: https://github.com/ARM-software/ebbr
-[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR
-[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images
-[4]: https://developer.arm.com/documentation/DUI1101/latest/
+[1] https://github.com/ARM-software/ebbr
+[2] https://www.arm.com/architecture/system-architectures/systemready-compliance-program/systemready-devicetree-band
+[3] https://github.com/ARM-software/arm-systemready/tree/main/SystemReady-devicetree-band/prebuilt_images
+[4] https://developer.arm.com/documentation/DUI1101/latest/
@@ -1,4 +1,4 @@
-# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_ARM_SMCCC_FEATURES=y
 CONFIG_BOOTCOMMAND="bootflow scan -lb"
 CONFIG_BOOTMETH_DISTRO=y
 CONFIG_BOOTM_EFI=y
@@ -17,8 +17,10 @@ CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y
 CONFIG_CMD_GETTIME=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_POWEROFF=y
 CONFIG_CMD_RNG=y
 CONFIG_CMD_RTC=y
+CONFIG_CMD_SMC=y
 CONFIG_CMD_TIME=y
 CONFIG_DM_RNG=y
 CONFIG_DM_RTC=y
@@ -29,6 +31,7 @@ CONFIG_EFI_LOADER=y
 CONFIG_EFI_LOADER_HII=y
 CONFIG_EFI_MM_COMM_TEE=y
 CONFIG_EFI_PARTITION=y
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
 CONFIG_EFI_SECURE_BOOT=y
 CONFIG_EFI_SET_TIME=y
 CONFIG_EFI_UNICODE_CAPITALIZATION=y
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8  atf-lf-6.12.20-2.0.0.tar.gz
+sha256  2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4  atf-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8  linux-lf-6.12.20-2.0.0.tar.gz
+sha256  27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b  linux-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3  u-boot-lf-6.12.20-2.0.0.tar.gz
+sha256  2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785  u-boot-lf-6.12.34-2.1.0.tar.gz
@@ -11,7 +11,7 @@ For more details about the board and the QorIQ Layerscape SoC, see the following
 Layerscape platforms are officially supported by NXP under the Layerscape
 Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project
 common with i.MX), but has a slower release cadence than LF. The currently used
-tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in
+tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in
 Buildroot, the latest Linux Factory release tag is always used, which may be
 considered pre-release software, as it may contain features which are not yet
 documented, and it generally undergoes less testing.
@@ -21,11 +21,11 @@ For the software Layerscape Debian Linux SDK User Guide, see:
  - https://www.nxp.com/docs/en/user-guide/UG10143.pdf

 The components from NXP are:
-  - rcw, lf-6.12.20-2.0.0
-  - atf (fork), lf-6.12.20-2.0.0
-  - uboot (fork), lf-6.12.20-2.0.0
+  - rcw, lf-6.12.34-2.1.0
+  - atf (fork), lf-6.12.34-2.1.0
+  - uboot (fork), lf-6.12.34-2.1.0
  - cadence-dp-firmware (blob), 8.16
-  - linux (fork), lf-6.12.20-2.0.0
+  - linux (fork), lf-6.12.34-2.1.0

 Build
 =====
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8  atf-lf-6.12.20-2.0.0.tar.gz
+sha256  2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4  atf-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8  linux-lf-6.12.20-2.0.0.tar.gz
+sha256  27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b  linux-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3  u-boot-lf-6.12.20-2.0.0.tar.gz
+sha256  2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785  u-boot-lf-6.12.34-2.1.0.tar.gz
@@ -11,7 +11,7 @@ for more details about the board and the QorIQ Layerscape SoC, see the following
 Layerscape platforms are officially supported by NXP under the Layerscape
 Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project
 common with i.MX), but has a slower release cadence than LF. The currently used
-tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in
+tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in
 Buildroot, the latest Linux Factory release tag is always used, which may be
 considered pre-release software, as it may contain features which are not yet
 documented, and it generally undergoes less testing.
@@ -21,13 +21,13 @@ For the software Layerscape Debian Linux SDK User Guide, see:
  - https://www.nxp.com/docs/en/user-guide/UG10143.pdf

 The components from NXP are:
-  - rcw, lf-6.12.20-2.0.0
-  - atf (fork), lf-6.12.20-2.0.0
-  - uboot (fork), lf-6.12.20-2.0.0
-  - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0
-  - linux (fork), lf-6.12.20-2.0.0
-  - fmlib, lf-6.12.20-2.0.0
-  - fmc, lf-6.12.20-2.0.0
+  - rcw, lf-6.12.34-2.1.0
+  - atf (fork), lf-6.12.34-2.1.0
+  - uboot (fork), lf-6.12.34-2.1.0
+  - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0
+  - linux (fork), lf-6.12.34-2.1.0
+  - fmlib, lf-6.12.34-2.1.0
+  - fmc, lf-6.12.34-2.1.0

 Build
 =====
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8  atf-lf-6.12.20-2.0.0.tar.gz
+sha256  2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4  atf-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8  linux-lf-6.12.20-2.0.0.tar.gz
+sha256  27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b  linux-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3  u-boot-lf-6.12.20-2.0.0.tar.gz
+sha256  2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785  u-boot-lf-6.12.34-2.1.0.tar.gz
@@ -12,7 +12,7 @@ For more details about the board and the QorIQ Layerscape SoC, see the following
 Layerscape platforms are officially supported by NXP under the Layerscape
 Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project
 common with i.MX), but has a slower release cadence than LF. The currently used
-tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in
+tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in
 Buildroot, the latest Linux Factory release tag is always used, which may be
 considered pre-release software, as it may contain features which are not yet
 documented, and it generally undergoes less testing.
@@ -22,13 +22,13 @@ For the software Layerscape Debian Linux SDK User Guide, see:
  - https://www.nxp.com/docs/en/user-guide/UG10143.pdf

 The components from NXP are:
-  - rcw, lf-6.12.20-2.0.0
-  - atf (fork), lf-6.12.20-2.0.0
-  - uboot (fork), lf-6.12.20-2.0.0
-  - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0
-  - linux (fork), lf-6.12.20-2.0.0
-  - fmlib, lf-6.12.20-2.0.0
-  - fmc, lf-6.12.20-2.0.0
+  - rcw, lf-6.12.34-2.1.0
+  - atf (fork), lf-6.12.34-2.1.0
+  - uboot (fork), lf-6.12.34-2.1.0
+  - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0
+  - linux (fork), lf-6.12.34-2.1.0
+  - fmlib, lf-6.12.34-2.1.0
+  - fmc, lf-6.12.34-2.1.0

 Build
 =====
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  738f029c6bfcdac5649e2c252970b1f44c1ce7fee9fe4657a25edc666375ffa8  atf-lf-6.12.20-2.0.0.tar.gz
+sha256  2d3f9c52e16766c290bdc0bc130d634e4c326a5b236dfb2f2ca3f0fa457e82d4  atf-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  c98177e85ace6400b06301101af3065e90463920c3e166da4ed22deffe960fb8  linux-lf-6.12.20-2.0.0.tar.gz
+sha256  27a1987ca0a5802d3ebb296b8134ec66d813ad86cf2a60779b45092735bbb23b  linux-lf-6.12.34-2.1.0.tar.gz
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  a39f7db3ffd2b7263ea5d02b0631decac1c89f7c1b96b77ba8e302f3641a3eb3  u-boot-lf-6.12.20-2.0.0.tar.gz
+sha256  2f25cde388b2f83ff7a8e3afe25aafb1db48dafb0fa3bf1e4f9fef603f3b4785  u-boot-lf-6.12.34-2.1.0.tar.gz
@@ -11,7 +11,7 @@ for more details about the board and the QorIQ Layerscape SoC, see the following
 Layerscape platforms are officially supported by NXP under the Layerscape
 Debian Linux SDK (LDLSDK). This uses components from Linux Factory (project
 common with i.MX), but has a slower release cadence than LF. The currently used
-tag is lf-6.12.20-2.0.0, which is in line with the latest LF tag. Generally, in
+tag is lf-6.12.34-2.1.0, which is in line with the latest LF tag. Generally, in
 Buildroot, the latest Linux Factory release tag is always used, which may be
 considered pre-release software, as it may contain features which are not yet
 documented, and it generally undergoes less testing.
@@ -21,13 +21,13 @@ For the software Layerscape Debian Linux SDK User Guide, see:
  - https://www.nxp.com/docs/en/user-guide/UG10143.pdf

 The components from NXP are:
-  - rcw, lf-6.12.20-2.0.0
-  - atf (fork), lf-6.12.20-2.0.0
-  - uboot (fork), lf-6.12.20-2.0.0
-  - qoriq-fm-ucode (blob), lf-6.12.20-2.0.0
-  - linux (fork), lf-6.12.20-2.0.0
-  - fmlib, lf-6.12.20-2.0.0
-  - fmc, lf-6.12.20-2.0.0
+  - rcw, lf-6.12.34-2.1.0
+  - atf (fork), lf-6.12.34-2.1.0
+  - uboot (fork), lf-6.12.34-2.1.0
+  - qoriq-fm-ucode (blob), lf-6.12.34-2.1.0
+  - linux (fork), lf-6.12.34-2.1.0
+  - fmlib, lf-6.12.34-2.1.0
+  - fmc, lf-6.12.34-2.1.0

 Build
 =====
@@ -0,0 +1 @@
+../versal/genimage.cfg
@@ -0,0 +1 @@
+../zynqmp/post-build.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# By default U-Boot loads DTB from a file named "system.dtb", and
+# with versal2, the Linux DTB is the same as the U-Boot DTB, so
+# let's use a symlink since the DTB is the same.
+ln -fs "${BINARIES_DIR}/u-boot.dtb" "${BINARIES_DIR}/system.dtb"
+
+BOARD_DIR="$(dirname "$0")"
+
+cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif"
+	the_ROM_image:
+	{
+	  image {
+	    { type=bootimage, file=${BINARIES_DIR}/boot.pdi }
+	    { type=bootloader, file=${BINARIES_DIR}/plm.elf }
+	    { core=asu, file=${BINARIES_DIR}/asufw.elf }
+	  }
+	  image {
+	    id = 0x1c000000, name=apu_subsystem
+	    { type=raw, load=0x01000000, file=${BINARIES_DIR}/u-boot.dtb }
+	    { core=a78-0, cluster=0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf }
+	    { core=a78-0, cluster=0, exception_level=el-1, trustzone, load=0x1800000, file=${BINARIES_DIR}/tee-raw.bin }
+	    { core=a78-0, cluster=0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf }
+	  }
+	}
+	__HEADER_EOF
+
+"${HOST_DIR}/bin/bootgen" -arch versal_2ve_2vm -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on
+support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
@@ -0,0 +1,182 @@
+This document describes the Buildroot support for the following
+Xilinx Versal Gen2 boards:
+
+******************************************
+Supported Versal Gen2 Boards:
+Xilinx VEK385 board
+******************************************
+
+Evaluation board features can be found here with the links below.
+
+VEK385:
+https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vek385.html
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make versal2_vek385_defconfig
+
+Compile everything and build the rootfs image:
+
+    $ make
+
+Result of the build
+-------------------
+
+After building, you should get a tree like this:
+
+    output/images/
+    +-- asufw.elf
+    +-- bl31.elf
+    +-- boot.bin
+    +-- bootgen.bif
+    +-- boot.pdi
+    +-- boot.vfat
+    +-- extlinux.conf
+    +-- Image
+    +-- plm.elf
+    +-- rootfs.ext2
+    +-- rootfs.ext4 -> rootfs.ext2
+    +-- sdcard.img
+    +-- system.dtb -> u-boot.dtb
+    +-- tee-raw.bin
+    +-- u-boot.dtb
+    `-- u-boot.elf
+
+How to write the SD card
+========================
+
+WARNING! This will destroy all the card content. Use with care!
+
+The sdcard.img file is a complete bootable image ready to be written
+on the boot medium. To install it, simply copy the image to an SD
+card:
+
+    # dd if=output/images/sdcard.img of=/dev/sdX
+
+Where 'sdX' is the device node of the SD.
+
+Eject the SD card, insert it in the board, and power it up.
+
+Support for other boards:
+=========================
+
+If you want to build a system for other boards based on the same SoC, and the
+board is already supported by the upstream kernel, U-Boot, and
+xilinx-prebuilt, you simply need to change the following Buildroot options:
+
+ - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=<dts file name>")
+ - xilinx-prebuilt (BR2_TARGET_XILINX_PREBUILT_BOARD)
+
+Custom versal2 board support:
+
+To generate a boot.bin image, Versal2 boards require a PDI (Programmable Device
+Image) generated by Xilinx Vivado which contains all the hardware specific
+boot information, such as clock, MIO and DDR initializations as well as any
+customizations in the programmable logic. Since this PDI can only be generated
+by Xilinx Vivado, Buildroot needs access to the prebuilt image. The Buildroot
+xilinx-prebuilt package has support for Versal2 XSA files exported from Xilinx
+Vivado.
+
+Using the option BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA, Buildroot can obtain
+the prebuilt PDI from the XSA file.
+
+1) Start with a defconfig supported by Buildroot (e.g. VEK385)
+    make versal2_vek385_defconfig
+
+2) make menuconfig
+    Visit the following menu and enable BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
+
+    Bootloaders  --->
+        xilinx-prebuilt  --->
+            [*] download a prebuilt Versal XSA
+
+3) Within the same menuconfig, configure location of XSA. It can be in the
+   local file system or downloadable from an https:// location.
+
+    Bootloaders  --->
+        xilinx-prebuilt  --->
+            (<path to XSA>) URL of custom XSA
+
+4) make
+
+The resulting output/images will contain a boot.bin that includes the custom
+PDI file extracted from the Xilinx Vivado exported XSA file.
+
+How to write boot.bin to VEK385 OSPI boot flash
+=======================================================
+
+The VEK385 cannot be configured to boot from the SD card directly because it
+is connected to the 2VE3858 by a USB to SD card bridge and not connected
+directly. For this reason, the boot.bin needs to be in the OSPI flash for
+booting the first boot stage, and u-boot can then boot Linux and the file
+system from the SD card.
+
+For writing the boot.bin file to the OSPI flash the first time, it is
+recommended to use the board system controller with the instructions on the
+wiki page below:
+https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/2273738753/Versal+Evaluation+Board+-+System+Controller+-+Update+7
+
+Once the first boot.bin has been flashed and the VEK385 is able to boot into
+u-boot, u-boot can then be used for subsequent updates to the OSPI flash using
+the instructions below.
+
+VEK385 U-Boot Flashing Instructions:
+    $ usb start
+    $ sf probe
+    $ fatload usb 0 0x40000000 boot.bin
+    $ sf erase 0x0 +$filesize
+    $ sf write 0x40000000 0x0 $filesize
+
+If a valid boot.bin is already in the OSPI flash, it is possible to boot the
+Buildroot generated SD card image without updating the OSPI boot.bin image, so
+this is an optional step when just updating Linux and the file system.
+
+IMPORTANT NOTES for the VEK385
+=======================================================
+
+1) The base-design.pdi on the https://github.com/Xilinx/soc-prebuilt-firmware
+repo is designed for revB of the VEK385 and will not work properly on revA.
+Users should either create their own Vivado XSA file if they have a revA
+board, or make sure to get a VEK385 revB or newer board.
+
+2) The default u-boot bootcmd is not the distro_bootcmd that buildroot
+expects. When booting for the first time, please stop the boot in u-boot
+and run the following commands:
+    $ setenv bootcmd 'run distro_bootcmd'
+    $ saveenv
+    $ boot
+
+3) When using the 2025.2 release, the default u-boot env value for fdt_addr_r
+is 0x21000000 which overlaps with the OS image causing the following boot
+failure:
+
+Found /extlinux/extlinux.conf
+Retrieving file: /extlinux/extlinux.conf
+1:      linux
+Retrieving file: /Image
+append: console="ttyAMA1,115200" root="/dev/sdd2" rw rootwait
+Retrieving file: /system.dtb
+## Flattened Device Tree blob at 21000000
+   Booting using the fdt blob at 0x21000000
+ERROR: FDT image overlaps OS image (OS=20200000..21cf0000)
+EXTLINUX FAILED: continuing...
+
+This will be fixed with 2026.1 and future releases, but for 2025.2, users
+must run the following u-boot commands to change the default value.
+    $ setenv fdt_addr_r 0x31000000
+    $ saveenv
+
+4) Depending on the device tree used, the USB->SD card interface may not be
+probed as /dev/sdd as the probing order can vary based on the device tree
+configuration. To deal with this, users will need to change the last
+parameter of BR2_ROOTFS_POST_SCRIPT_ARGS to sda2, sdb2 or sdc2 depending on
+which corresponds to their configuration's USB->SD card.
+
+For example, the default value in the versal2_vek385_defconfig:
+BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sdd2"
+
+If the USB->SD card interface probed first, this would need to be changed to:
+BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sda2"
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d  xlnx_rebase_v2.12_2025.1.tar.gz
+sha256  ea59fbfb702857a24f96ee8e9cf04f997942db1de98f8406b7daf9dcc8f4e9ea  xlnx_rebase_v2.12_2025.2.tar.gz
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  ea55acf69bead3d4cf121de414cccfbe75a3c36465c93d9500cc00688d9b8d9d  xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz
+sha256  38aec9ce252ed6a0b64d294d4d58bf51e25b249eefb31b800a5ce62cb084298a  xlnx_rebase_v6.12_LTS_2025.2.tar.gz
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  3b8969a25815a0be84f34033827e5eb557e10f0f13ebabaee339461f8520ec72  xlnx_rebase_v4.5.0_2025.2.tar.gz
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93  xlnx_rebase_v2025.01_2025.1.tar.gz
+sha256  8819cbebda739436d5d2fbdef578ec3c9b902f7edbe0ce4ed6f0ddf254fcf2a7  xlnx_rebase_v2025.01_2025.2.tar.gz
@@ -4,7 +4,7 @@ config BR2_TARGET_XILINX_FIRMWARE_ARCH_SUPPORTS
 	# All Xilinx SoCs using this package are aarch64 only
 	depends on BR2_aarch64
 	# only CPUs with corresponding firmwares:
-	depends on BR2_cortex_a53 || BR2_cortex_a72
+	depends on BR2_cortex_a53 || BR2_cortex_a72 || BR2_cortex_a78

 menu "Bootloaders"

@@ -1,5 +1,6 @@
 comment "xilinx-embeddedsw needs a bare metal toolchain for tuple microblazeel-buildroot-elf"
 	depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf"
+	depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH != "microblazeel-buildroot-elf riscv32-buildroot-elf"
 	depends on BR2_TOOLCHAIN_BARE_METAL_BUILDROOT

 menuconfig BR2_TARGET_XILINX_EMBEDDEDSW
@@ -21,11 +22,33 @@ if BR2_TARGET_XILINX_EMBEDDEDSW

 config BR2_TARGET_XILINX_EMBEDDEDSW_VERSION
 	string "xilinx-embeddedsw version"
-	default "xilinx_v2025.1"
+	default "xilinx_v2025.2"
 	help
 	  Release version of Xilinx/embeddedsw.
 	  Must be xilinx_v2023.1 or newer.

+config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW
+	bool "versal2 asufw"
+	depends on BR2_cortex_a78
+	help
+	  Build versal2 asufw application from Xilinx/embeddedsw
+	  repo.
+
+	  https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/asufw
+	  Version must be xilinx_v2025.2 or newer.
+
+config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM
+	bool "versal2 plm"
+	depends on BR2_cortex_a78
+	help
+	  Build versal2 plm application from Xilinx/embeddedsw repo.
+	  If selected, the xilinx-prebuilt package will not install
+	  the plm.elf since it will come from the xilinx-embeddedsw
+	  package.
+
+	  https://github.com/Xilinx/embeddedsw/tree/master/lib/sw_apps/versal_plm
+	  Version must be xilinx_v2025.2 or newer.
+
 config BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM
 	bool "versal plm"
 	depends on BR2_cortex_a72
@@ -1,5 +0,0 @@
-# Locally calculated
-sha256  867b7c7652f754d1a3d6edfe76e53223670e2b4c7e4144d4db1604403d68f616  xilinx-embeddedsw-xilinx_v2025.1.tar.gz
-
-# Locally calculated
-sha256  fbee87edd32cf203fdd7925f0bab15c98e2dc1e0d61e70867f1190dc4a605b12  license.txt
@@ -30,6 +30,38 @@ XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_CFLAGS = \
 	"-Os -flto -ffat-lto-objects $(XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS)"

 XILINX_EMBEDDEDSW_CFLAGS = "-Os -flto -ffat-lto-objects"
+XILINX_EMBEDDEDSW_ASUFW_CFLAGS = "-O2 -ffat-lto-objects -fno-lto"
+
+ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW),y)
+define XILINX_EMBEDDEDSW_BUILD_VERSAL2_ASUFW
+	$(MAKE) -C $(@D)/lib/sw_apps/asufw/src \
+		COMPILER=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc \
+		ARCHIVER=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc-ar \
+		CC=$(HOST_DIR)/bin/riscv32-buildroot-elf-gcc \
+		CFLAGS=$(XILINX_EMBEDDEDSW_ASUFW_CFLAGS)
+endef
+
+define XILINX_EMBEDDEDSW_INSTALL_VERSAL2_ASUFW
+	$(INSTALL) -D -m 0755 $(@D)/lib/sw_apps/asufw/src/asufw.elf \
+		$(BINARIES_DIR)/asufw.elf
+endef
+endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW
+
+ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM),y)
+define XILINX_EMBEDDEDSW_BUILD_VERSAL2_PLM
+	$(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal_2ve_2vm \
+		COMPILER=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
+		ARCHIVER=$(XILINX_EMBEDDEDSW_MICROBLAZE_AR) \
+		CC=$(XILINX_EMBEDDEDSW_MICROBLAZE_CC) \
+		CFLAGS=$(XILINX_EMBEDDEDSW_CFLAGS)
+endef
+
+define XILINX_EMBEDDEDSW_INSTALL_VERSAL2_PLM
+	$(INSTALL) -D -m 0755 \
+		$(@D)/lib/sw_apps/versal_plm/src/versal_2ve_2vm/plm.elf \
+		$(BINARIES_DIR)/plm.elf
+endef
+endif # BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM

 ifeq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y)
 define XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM
@@ -77,12 +109,16 @@ endef
 endif # BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW

 define XILINX_EMBEDDEDSW_BUILD_CMDS
+	$(XILINX_EMBEDDEDSW_BUILD_VERSAL2_ASUFW)
+	$(XILINX_EMBEDDEDSW_BUILD_VERSAL2_PLM)
 	$(XILINX_EMBEDDEDSW_BUILD_VERSAL_PLM)
 	$(XILINX_EMBEDDEDSW_BUILD_VERSAL_PSMFW)
 	$(XILINX_EMBEDDEDSW_BUILD_ZYNQMP_PMUFW)
 endef

 define XILINX_EMBEDDEDSW_INSTALL_IMAGES_CMDS
+	$(XILINX_EMBEDDEDSW_INSTALL_VERSAL2_ASUFW)
+	$(XILINX_EMBEDDEDSW_INSTALL_VERSAL2_PLM)
 	$(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PLM)
 	$(XILINX_EMBEDDEDSW_INSTALL_VERSAL_PSMFW)
 	$(XILINX_EMBEDDEDSW_INSTALL_ZYNQMP_PMUFW)
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256  fb9a705a2974fa4d8d79142baea204d388389b9b37d6f26194b7b759f8978457  xilinx-embeddedsw-xilinx_v2025.2.tar.gz
+
+# Locally calculated
+sha256  5ed583a37f9592d4bef73061f14f85c2ca70b8b7a12ffe1ef8ea808fbb764425  license.txt
@@ -17,7 +17,7 @@ if BR2_TARGET_XILINX_PREBUILT

 config BR2_TARGET_XILINX_PREBUILT_VERSION
 	string "prebuilt version"
-	default "xilinx_v2025.1_update1"
+	default "xilinx_v2025.2"
 	help
 	  Release version of Xilinx firmware.
 	  Must be xilinx_v2023.1 or newer.
@@ -26,6 +26,7 @@ choice
 	bool "family variant"
 	default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE  # legacy
 	default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_cortex_a72
+	default BR2_TARGET_XILINX_PREBUILT_VERSAL2 if BR2_cortex_a78
 	default BR2_TARGET_XILINX_PREBUILT_ZYNQMP

 config BR2_TARGET_XILINX_PREBUILT_ZYNQMP
@@ -40,14 +41,21 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL
 	bool "versal"
 	depends on BR2_cortex_a72

+config BR2_TARGET_XILINX_PREBUILT_VERSAL2
+	bool "versal2"
+	depends on BR2_cortex_a78
+	help
+	  Version must be xilinx_v2025.2 or newer.
+
 endchoice

 config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
 	bool "download a prebuilt Versal XSA"
-	depends on BR2_TARGET_XILINX_PREBUILT_VERSAL
+	depends on BR2_TARGET_XILINX_PREBUILT_VERSAL || BR2_TARGET_XILINX_PREBUILT_VERSAL2
 	help
 	  The Xilinx Support Archive (XSA) provides custom Xilinx
 	  firmware files generated by the AMD Vivado Design Suite.
+	  This option applies to either versal or versal2.

 	  https://docs.amd.com/r/en-US/ug1400-vitis-embedded/Creating-a-Hardware-Design-XSA-File

@@ -60,32 +68,37 @@ config BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION
 	  file. This URL can use any protocol recognized by Buildroot,
 	  like http://, ftp://, file:// or scp://.

-	  When pointing to a local XSA using file://, you may want to
-	  use a make variable like $(TOPDIR) to reference the root of
-	  the Buildroot tree.
+	  When pointing to a local XSA using file:// or simply the
+	  local path, you may want to use a make variable like
+	  $(TOPDIR) to reference the root of the Buildroot tree.
+
+	  This option applies to either versal or versal2.

 endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA

 config BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI
 	bool "install versal pld.pdi"
-	depends on BR2_TARGET_XILINX_PREBUILT_VERSAL
+	depends on BR2_TARGET_XILINX_PREBUILT_VERSAL || BR2_TARGET_XILINX_PREBUILT_VERSAL2
 	help
 	  When using the Versal Segmented Configuration, there is a
 	  pld.pdi file containing the FPGA bitstream which can be
 	  loaded at run-time.  By enabling this option, the pld.pdi
 	  will be installed to the target /lib/firmware/xilinx dir.
+	  This option applies to either versal or versal2.

 config BR2_TARGET_XILINX_PREBUILT_FAMILY
 	string
 	default "zynqmp" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP
 	default "kria" if BR2_TARGET_XILINX_PREBUILT_KRIA
 	default "versal" if BR2_TARGET_XILINX_PREBUILT_VERSAL
+	default "versal_2ve_2vm" if BR2_TARGET_XILINX_PREBUILT_VERSAL2

 config BR2_TARGET_XILINX_PREBUILT_BOARD
 	string "board name"
 	default "zcu102" if BR2_TARGET_XILINX_PREBUILT_ZYNQMP
 	default "kr260" if BR2_TARGET_XILINX_PREBUILT_KRIA
 	default "vck190" if BR2_TARGET_XILINX_PREBUILT_VERSAL
+	default "vek385" if BR2_TARGET_XILINX_PREBUILT_VERSAL2
 	help
 	  Name of Xilinx target board.
 	  Used for installing the appropriate firmware.
@@ -1,5 +0,0 @@
-# Locally calculated
-sha256  48fd698a16f79b9a828c35ca5b2b50fe832149d1a2938c94c0bb6a2e249b0bed  xilinx-prebuilt-xilinx_v2025.1_update1.tar.gz
-
-# Locally calculated
-sha256  7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f  LICENSE
@@ -10,6 +10,9 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y)
 XILINX_PREBUILT_FILE = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA_LOCATION))
 XILINX_PREBUILT_SITE = $(patsubst %/,%,$(dir $(XILINX_PREBUILT_FILE)))
 XILINX_PREBUILT_SOURCE = $(notdir $(XILINX_PREBUILT_FILE))
+ifeq ($(findstring ://,$(XILINX_PREBUILT_FILE)),)
+XILINX_PREBUILT_SITE_METHOD = file
+endif
 define XILINX_PREBUILT_EXTRACT_CMDS
 	$(UNZIP) $(XILINX_PREBUILT_DL_DIR)/$(XILINX_PREBUILT_SOURCE) -d $(@D)
 endef
@@ -26,16 +29,11 @@ XILINX_PREBUILT_BOARD = $(call qstrip,$(BR2_TARGET_XILINX_PREBUILT_BOARD))

 XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAMILY)

-ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y)
+# Common Files for All Versal Families
+ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL)$(BR2_TARGET_XILINX_PREBUILT_VERSAL2),y)
 ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y)
 # Supports either plm.elf or plmfw.elf filenames
 XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm*.elf
-# Unlike the psmfw.elf file for Xilinx development boards,
-# AMD Vivado Design Suite currently generates a file named psm_fw.elf.
-# Future versions of AMD Vivado will generate a file named psmfw.elf,
-# so to support current and future AMD Vivado versions, the filename
-# psm*fw.elf is used.
-XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf
 # We need the *.pdi glob, because the file has different names for the
 # different boards, and it has to be named boot.pdi when installed.
 # If Segmented Configuration is used, there will be two pdi files and we need
@@ -63,7 +61,6 @@ endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI
 else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
 # Supports either plm.elf or plmfw.elf filenames
 XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm*.elf
-XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf
 # We need the *.pdi glob, because the file has different names for the
 # different boards, and it has to be named boot.pdi when installed.
 # If Segmented Configuration is used, there will be two pdi files and we need
@@ -91,11 +88,27 @@ endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI
 endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA

 ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM),y)
+ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM),y)
 define XILINX_PREBUILT_INSTALL_VERSAL_PLM
 	$(INSTALL) -D -m 0755 $(XILINX_PREBUILT_PLM) \
 		$(BINARIES_DIR)/plm.elf
 endef
+endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM
 endif # !BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM
+endif # BR2_TARGET_XILINX_PREBUILT_VERSAL | BR2_TARGET_XILINX_PREBUILT_VERSAL2
+
+# Files specific to Versal Gen1
+ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y)
+ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y)
+# Unlike the psmfw.elf file for Xilinx development boards,
+# AMD Vivado Design Suite currently generates a file named psm_fw.elf.
+# Future versions of AMD Vivado will generate a file named psmfw.elf,
+# so to support current and future AMD Vivado versions, the filename
+# psm*fw.elf is used.
+XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf
+else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
+XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf
+endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA

 ifneq ($(BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW),y)
 define XILINX_PREBUILT_INSTALL_VERSAL_PSMFW
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256  d292a52ac167631860b5e9a8d8356946289da164ddde4c5393977dc1652dcadb  xilinx-prebuilt-xilinx_v2025.2.tar.gz
+
+# Locally calculated
+sha256  e7ed8599c0cbf9e28d07883f94ee6ff694f6a702daa56c75b2cf4b30105baecc  LICENSE
@@ -1,12 +1,16 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y
 BR2_GLOBAL_PATCH_DIR="board/arm/fvp-ebbr/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arm/fvp-ebbr/post-image.sh support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/arm/fvp-ebbr/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y
@@ -17,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.14.0"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="fvp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/arm/fvp-ebbr/fvp-ebbr.dts"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
@@ -26,17 +30,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ARM_TSP_RAM_LOCATION=tdram FVP_DT_PREFIX=fvp-ebbr"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_GRUB2=y
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot efi_gop efifwsetup efinet efitextmode ext2 fat halt help linux lsefi lsefimmap lsefisystab minicmd normal part_gpt part_msdos reboot squash4"
 BR2_TARGET_OPTEE_OS=y
-BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
+BR2_TARGET_OPTEE_OS_CUSTOM_VERSION=y
+BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE="4.8.0"
+BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
 BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-fvp"
-BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y"
+BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y CFG_TEE_CORE_LOG_LEVEL=2 CFG_TEE_TA_LOG_LEVEL=2"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vexpress_fvp"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/arm/fvp-ebbr/u-boot.fragment"
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -22,11 +22,11 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
@@ -36,7 +36,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1043a-rdb/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1043ardb"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
@@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1043ardb_tfa"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
@@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
@@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
@@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-rdb/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.20-2.0.0)/linux-lf-6.12.20-2.0.0.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.12.34-2.1.0)/linux-lf-6.12.34-2.1.0.tar.gz"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.20-2.0.0)/atf-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.12.34-2.1.0)/atf-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046ardb"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
@@ -38,7 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.20-2.0.0)/u-boot-lf-6.12.20-2.0.0.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.12.34-2.1.0)/u-boot-lf-6.12.34-2.1.0.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046ardb_tfa"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
@@ -0,0 +1,55 @@
+BR2_aarch64=y
+BR2_cortex_a78=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf riscv32-buildroot-elf"
+BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_MULTILIB=y
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal2/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA1,115200 sdd2"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_XILINX_FPGAUTIL=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal2"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="VERSAL2_CONSOLE=cadence1"
+BR2_TARGET_OPTEE_OS=y
+BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y
+BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,optee_os,xlnx_rebase_v4.5.0_2025.2)/xlnx_rebase_v4.5.0_2025.2.tar.gz"
+BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
+BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
+BR2_TARGET_OPTEE_OS_PLATFORM="versal2"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amd_versal2_virt"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal2-vek385-revB"
+BR2_TARGET_XILINX_EMBEDDEDSW=y
+BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_ASUFW=y
+BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL2_PLM=y
+BR2_TARGET_XILINX_PREBUILT=y
+BR2_PACKAGE_HOST_BOOTGEN=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1"
@@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB"
@@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA"
@@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA"
@@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB"
@@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB"
@@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.40)/xlnx_rebase_v6.12_LTS_merge_6.12.40.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.2)/xlnx_rebase_v6.12_LTS_2025.2.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.1)/xlnx_rebase_v2.12_2025.1.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.1)/xlnx_rebase_v2025.01_2025.1.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@@ -992,6 +992,7 @@ menu "External python modules"
 	source "package/python-alembic/Config.in"
 	source "package/python-alsaaudio/Config.in"
 	source "package/python-aniso8601/Config.in"
+	source "package/python-annotated-doc/Config.in"
 	source "package/python-annotated-types/Config.in"
 	source "package/python-ansicolors/Config.in"
 	source "package/python-anyio/Config.in"
@@ -1136,6 +1137,7 @@ menu "External python modules"
 	source "package/python-google-api-core/Config.in"
 	source "package/python-google-auth/Config.in"
 	source "package/python-googleapis-common-protos/Config.in"
+	source "package/python-gpiod/Config.in"
 	source "package/python-gpiozero/Config.in"
 	source "package/python-greenlet/Config.in"
 	source "package/python-grpc-requests/Config.in"
@@ -2790,6 +2792,7 @@ comment "Utilities"
 	source "package/screen/Config.in"
 	source "package/screenfetch/Config.in"
 	source "package/sexpect/Config.in"
+	source "package/sigsum-go/Config.in"
 	source "package/sudo/Config.in"
 	source "package/terminology/Config.in"
 	source "package/time/Config.in"
@@ -110,6 +110,7 @@ menu "Host utilities"
 	source "package/sdbus-cpp/Config.in.host"
 	source "package/sdbusplus/Config.in.host"
 	source "package/sentry-cli/Config.in.host"
+	source "package/sigsum-go/Config.in.host"
 	source "package/skopeo/Config.in.host"
 	source "package/sloci-image/Config.in.host"
 	source "package/snagboot/Config.in.host"
@@ -1,6 +1,6 @@
-# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.12/
-sha1  6d9aa64b195e1b4d72a9b032f8ee70ad0798802d  acsccid-1.1.12.tar.bz2
-md5  34bf40daedd3428c07f9937d4ec43129  acsccid-1.1.12.tar.bz2
+# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.13/
+md5  80a017891884863feccf2221a656d6b8  acsccid-1.1.13.tar.bz2
+sha1  35be7ee00b331fd7b4f9b718d39e4f43a1fca5c1  acsccid-1.1.13.tar.bz2
 # Locally computed
-sha256  28f6075a5494a568ce2fd8666c489f6f4a51599b44fbc9390e1ddb48d3ccc5bd  acsccid-1.1.12.tar.bz2
+sha256  8b19aba103ec03c448b9d1b562c8322f8d2ff37cf21d4cb8b0cf522c5f385c9f  acsccid-1.1.13.tar.bz2
 sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-ACSCCID_VERSION = 1.1.12
+ACSCCID_VERSION = 1.1.13
 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2
 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid
 ACSCCID_LICENSE = LGPL-2.1+
@@ -1,4 +1,4 @@
 # Locally computed:
-sha256  a5b8109da3c169802f51a14d3bd1246395c24bbca55601760b0c96a3c0b2f8fa  armadillo-15.2.1.tar.xz
+sha256  8ee01cd4da55bc07b7bc7d3cba702ac6e8137d384d7e7185f3f4ae1f0c79704f  armadillo-15.2.2.tar.xz
 # License files, locally calculated
 sha256  3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  LICENSE.txt
@@ -4,7 +4,7 @@
 #
 ################################################################################

-ARMADILLO_VERSION = 15.2.1
+ARMADILLO_VERSION = 15.2.2
 ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
 ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
 ARMADILLO_INSTALL_STAGING = YES
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/at-spi2-core/2.58/at-spi2-core-2.58.1.sha256sum
-sha256  7f374a6a38cd70ff4b32c9d3a0310bfa804d946fed4c9e69a7d49facdcb95e9c  at-spi2-core-2.58.1.tar.xz
+# From https://download.gnome.org/sources/at-spi2-core/2.58/at-spi2-core-2.58.2.sha256sum
+sha256  a2823b962ed16cdd5cb1fc5365029fd218394d852acd4098b321854bd6692f6e  at-spi2-core-2.58.2.tar.xz

 # locally calculated
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
@@ -5,7 +5,7 @@
 ################################################################################

 AT_SPI2_CORE_VERSION_MAJOR = 2.58
-AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1
+AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).2
 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz
 AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR)
 AT_SPI2_CORE_LICENSE = LGPL-2.1+
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  80cfb951c5614b8c2e55a59ea2e5723a18ebed08da80e5420e525d6bf273771a  azmq-1.0.3.tar.gz
+sha256  6acd312b1358be23d65e0695f0c6ec176efef944af353961e99dfb777169a6b6  azmq-v1.0.3-54-g819b24035cfa5b73081e21f5867445f2344f680d.tar.gz
 sha256  c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE-BOOST_1_0
@@ -4,8 +4,8 @@
 #
 ################################################################################

-AZMQ_VERSION = 1.0.3
-AZMQ_SITE = $(call github,zeromq,azmq,v$(AZMQ_VERSION))
+AZMQ_VERSION = v1.0.3-54-g819b24035cfa5b73081e21f5867445f2344f680d
+AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION))
 AZMQ_DEPENDENCIES = boost zeromq
 AZMQ_LICENSE = BSL-1.0
 AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0
@@ -0,0 +1,30 @@
+From 1a9a5fd688d811ca7300edccbdfc623fdaa1b8dc Mon Sep 17 00:00:00 2001
+From: Dan Cristoloveanu <dcristo@microsoft.com>
+Date: Wed, 27 Jan 2021 12:59:18 -0800
+Subject: [PATCH] Bump cmake version and update dependencies (#65)
+
+* Bump cmake version to 3.18
+
+Upstream: https://github.com/Azure/macro-utils-c/commit/1a9a5fd688d811ca7300edccbdfc623fdaa1b8dc
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[backported to LTS_03_2025]
+---
+ deps/azure-macro-utils-c/CMakeLists.txt     | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29b3416..3b82d4e 100644
+--- a/deps/azure-macro-utils-c/CMakeLists.txt
+++ b/deps/azure-macro-utils-c/CMakeLists.txt
+@@ -1,7 +1,9 @@
+ #Copyright (c) Microsoft. All rights reserved.
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+-cmake_minimum_required(VERSION 2.8.11)
+if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
+    cmake_minimum_required(VERSION 3.18)
+endif()
+ 
+ if(TARGET azure_macro_utils_c)
+     return()
@@ -0,0 +1,30 @@
+From 02ed1852d45fda6994748118bab129e5d2527c0f Mon Sep 17 00:00:00 2001
+From: Dan Cristoloveanu <dcristo@microsoft.com>
+Date: Wed, 27 Jan 2021 21:35:21 -0800
+Subject: [PATCH] Bump cmake version (#189)
+
+* Bump version for cmake
+
+Upstream: https://github.com/Azure/umock-c/commit/02ed1852d45fda6994748118bab129e5d2527c0f
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[backported to LTS_03_2025]
+---
+ deps/umock-c/CMakeLists.txt | 5 ++++-
+ 1 files change, 13 insertions(+), 74 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1a7a9f4..fc479cac 100644
+--- a/deps/umock-c/CMakeLists.txt
+++ b/deps/umock-c/CMakeLists.txt
+@@ -1,7 +1,9 @@
+ #Copyright (c) Microsoft. All rights reserved.
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+-cmake_minimum_required(VERSION 2.8.11)
+if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
+    cmake_minimum_required(VERSION 3.18)
+endif()
+ 
+ if(TARGET umock_c)
+     return()
@@ -35,6 +35,7 @@ if BR2_PACKAGE_BANDWIDTHD
 config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
 	bool "enable postgresql log target support"
 	depends on BR2_USE_MMU # postgresql
+	depends on !BR2_sparc # postgresql
 	depends on BR2_USE_WCHAR # postgresql
 	depends on BR2_ENABLE_LOCALE # postgresql
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql
@@ -48,9 +49,11 @@ config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
 	  (github.com/nroach44/bandwidthd) for more information.

 comment "postgresql support needs a toolchain w/ dynamic library, wchar"
+	depends on !BR2_sparc
 	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR

 comment "postgresql support can't be built with Optimize for fast"
+	depends on !BR2_sparc
 	depends on BR2_OPTIMIZE_FAST

 config BR2_PACKAGE_BANDWIDTHD_SQLITE3
@@ -1,125 +0,0 @@
-From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Fri, 16 Feb 2024 22:33:29 +1030
-Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16
-
-The assertion in nios2_elf32_install_imm16 triggers when the PLT is
-twice the maximum allowable size for a branch from PLTn to reach
-.PLTresolve, and on no other call to nios2_elf32_install_imm16.  That
-makes the assertion completely useless.  We can handle a PIC PLT
-exceeding 0x8000 in size by bouncing branches that won't reach through
-previous branches.
-
-	PR 27597
-	* elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT.
-	(nios2_build_one_stub): Don't bother masking value passed to
-	nios2_elf32_install_imm16.
-	(nios2_elf32_finish_dynamic_symbol): Likewise.  Handle overflow
-	of PLTn branch to .PLTresolve by bouncing through prior branches.
-
-Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1
-
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
- bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++----------------
- 1 file changed, 24 insertions(+), 16 deletions(-)
-
-diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
-index bebf4239958..7f61e2f8507 100644
--- a/bfd/elf32-nios2.c
-+++ b/bfd/elf32-nios2.c
-@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value)
- {
-   bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset);
- 
-  BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff);
-
-   bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6),
- 	      sec->contents + offset);
- }
-@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U
-       nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset,
- 				 hiadj (sym_value));
-       nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4,
-				 (sym_value & 0xffff));
-+				 sym_value);
-       stub_sec->size += 12;
-       break;
-     default:
-@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd,
-       /* Emit the PLT entry.  */
-       if (bfd_link_pic (info))
- 	{
-+	  bfd_vma br_offset;
-+
- 	  nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset,
- 				    3);
- 	  plt_index = (h->plt.offset - 24) / 12;
- 	  got_offset = (plt_index + 3) * 4;
- 	  nios2_elf32_install_imm16 (splt, h->plt.offset,
-				     hiadj(plt_index * 4));
-+				     hiadj (plt_index * 4));
- 	  nios2_elf32_install_imm16 (splt, h->plt.offset + 4,
-				     (plt_index * 4) & 0xffff);
-	  nios2_elf32_install_imm16 (splt, h->plt.offset + 8,
-				     0xfff4 - h->plt.offset);
-+				     plt_index * 4);
-+	  br_offset = -(h->plt.offset + 12);
-+	  /* If this plt entry is too far away from the start of .plt
-+	     for the "br" to reach .PLTresolve, bounce through one or
-+	     more of the previous "br" instructions.  */
-+	  if (br_offset < (bfd_vma) -32768)
-+	    {
-+	      br_offset += 32768 / 12 * 12 - 4;
-+	      while (br_offset < (bfd_vma) -32768)
-+		br_offset += 32768 / 12 * 12;
-+	    }
-+	  nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset);
-+
- 	  got_address = (sgotplt->output_section->vma + sgotplt->output_offset
- 			 + got_offset);
- 
-@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd,
- 	  nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3);
- 	  got_address = (sgotplt->output_section->vma + sgotplt->output_offset
- 			 + got_offset);
-	  nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address));
-	  nios2_elf32_install_imm16 (splt, h->plt.offset + 4,
-				     got_address & 0xffff);
-+	  nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address));
-+	  nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address);
- 
- 	  /* Fill in the entry in the global offset table.  */
- 	  bfd_put_32 (output_bfd,
-@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd,
- 	      BFD_ASSERT ((got_pcrel & 0xf) == 0);
- 	      nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6);
- 	      nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel));
-	      nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff);
-	      nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff);
-+	      nios2_elf32_install_imm16 (splt, 12, got_pcrel);
-+	      nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4);
- 	    }
- 	  else
- 	    {
-@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd,
- 
- 	      nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7);
- 	      nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start));
-	      nios2_elf32_install_imm16 (splt, res_size + 4,
-					 res_start & 0xffff);
-+	      nios2_elf32_install_imm16 (splt, res_size + 4, res_start);
- 	      nios2_elf32_install_imm16 (splt, res_size + 12,
- 					 hiadj (got_address));
- 	      nios2_elf32_install_imm16 (splt, res_size + 16,
-					 (got_address + 4) & 0xffff);
-+					 got_address + 4);
- 	      nios2_elf32_install_imm16 (splt, res_size + 20,
-					 (got_address + 8) & 0xffff);
-+					 got_address + 8);
- 	    }
- 	}
-     }
-- 
-2.34.1
-
@@ -1,90 +0,0 @@
-From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 16 Nov 2024 05:03:52 +0000
-Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert
-
-static_assert is declared in C23 so we can't reuse that identifier:
-* Define our own static_assert conditionally;
-
-* Rename "static assert" hacks to _N as we do already in some places
-  to avoid a conflict.
-
-ChangeLog:
-	PR ld/32372
-
-        * i386-gen.c (static_assert): Define conditionally.
-        * mips-formats.h (MAPPED_INT): Rename identifier.
-        (MAPPED_REG): Rename identifier.
-        (OPTIONAL_MAPPED_REG): Rename identifier.
-        * s390-opc.c (static_assert): Define conditionally.
-
-Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4
-Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
---
- opcodes/i386-gen.c     | 2 ++
- opcodes/mips-formats.h | 6 +++---
- opcodes/s390-opc.c     | 2 ++
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
-index 053b66675c5..7ee8a30310c 100644
--- a/opcodes/i386-gen.c
-+++ b/opcodes/i386-gen.c
-@@ -30,7 +30,9 @@
- 
- /* Build-time checks are preferrable over runtime ones.  Use this construct
-    in preference where possible.  */
-+#ifndef static_assert
- #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
-+#endif
- 
- static const char *program_name = NULL;
- static int debug = 0;
-diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h
-index 90df7100803..c4dec6352bf 100644
--- a/opcodes/mips-formats.h
-+++ b/opcodes/mips-formats.h
-@@ -49,7 +49,7 @@
- #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \
-   { \
-     typedef char ATTRIBUTE_UNUSED \
-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-+      static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-     static const struct mips_mapped_int_operand op = { \
-       { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \
-     }; \
-@@ -83,7 +83,7 @@
- #define MAPPED_REG(SIZE, LSB, BANK, MAP) \
-   { \
-     typedef char ATTRIBUTE_UNUSED \
-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-+      static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-     static const struct mips_reg_operand op = { \
-       { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \
-     }; \
-@@ -93,7 +93,7 @@
- #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \
-   { \
-     typedef char ATTRIBUTE_UNUSED \
-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-+      static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
-     static const struct mips_reg_operand op = { \
-       { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \
-     }; \
-diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
-index 9d9f0973e55..49efd714157 100644
--- a/opcodes/s390-opc.c
-+++ b/opcodes/s390-opc.c
-@@ -36,7 +36,9 @@
- 
- /* Build-time checks are preferrable over runtime ones.  Use this construct
-    in preference where possible.  */
-+#ifndef static_assert
- #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
-+#endif
- 
- #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
- 
-- 
-2.34.1
-
@@ -1,770 +0,0 @@
-From 0cec0418dacd30f4215d0d778b4e5d23f6a93801 Mon Sep 17 00:00:00 2001
-From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
-Date: Tue, 3 Sep 2024 21:30:31 -0700
-Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang
-
-gprofng/ChangeLog
-2024-09-03  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>.
-
-	PR gprofng/32097
-	* common/hwcdrv.c: Fix -Wempty-body warnings.
-	* common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings.
-	* common/hwctable.c: Fix -Wdeprecated-non-prototype warnings.
-	* libcollector/collector.c: Likewise.
-	* libcollector/collector.h: Likewise.
-	* libcollector/collectorAPI.c: Likewise.
-	* libcollector/dispatcher.c: Likewise.
-	* libcollector/iotrace.c: Likewise.
-	* libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings.
-	* libcollector/libcol_util.h: Remove unused declarations.
-	* libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings.
-	* src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings.
-	* src/Dbe.cc: Fix -Wself-assign warnings.
-	* src/DbeSession.cc: Fix -Wunused-but-set-variable warnings.
-	* src/Disasm.cc: Fix -Wunused-const-variable warnings.
-	* src/Experiment.cc: Fix -Wunused-private-field warnings.
-	* src/HashMap.h: Fix -Wself-assign warnings.
-	* src/IOActivity.h: Fix -Wunused-private-field warnings.
-	* src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings.
-	* src/collctrl.h: Fix -Wunused-private-field warnings.
-	* src/collector_module.h: Fix -Wdeprecated-non-prototype warnings.
-	* src/gp-display-src.cc: Fix -Wunused-private-field warnings.
-	* src/gp-print.h: Fix -Wheader-guard warnings.
-	* src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings.
-	* src/util.cc: Fix -Wunused-but-set-variable warnings.
-
-Upstream: b79c457ca01df82dbe1facb708e45def4584c903
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- gprofng/common/hwcdrv.c             |  3 ++-
- gprofng/common/hwcentry.h           |  7 +----
- gprofng/common/hwctable.c           | 13 +---------
- gprofng/libcollector/collector.c    | 15 ++++-------
- gprofng/libcollector/collector.h    |  2 +-
- gprofng/libcollector/collectorAPI.c | 15 ++++++-----
- gprofng/libcollector/dispatcher.c   | 19 ++++++++------
- gprofng/libcollector/iotrace.c      | 12 ++++-----
- gprofng/libcollector/libcol_util.c  |  2 --
- gprofng/libcollector/libcol_util.h  |  6 -----
- gprofng/libcollector/linetrace.c    | 40 +++++++++++++++++------------
- gprofng/src/BaseMetricTreeNode.h    |  1 -
- gprofng/src/Dbe.cc                  | 12 ++++-----
- gprofng/src/DbeSession.cc           |  3 ---
- gprofng/src/Disasm.cc               |  1 -
- gprofng/src/Experiment.cc           |  2 --
- gprofng/src/HashMap.h               |  3 +--
- gprofng/src/IOActivity.h            |  1 -
- gprofng/src/collctrl.cc             | 14 +++++-----
- gprofng/src/collector_module.h      | 20 +++++++--------
- gprofng/src/gp-display-src.cc       |  8 ------
- gprofng/src/gp-print.h              |  2 +-
- gprofng/src/util.cc                 | 10 +++-----
- 23 files changed, 84 insertions(+), 127 deletions(-)
-
-diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c
-index 2d549b0d6a5..fa1ad32430b 100644
--- a/gprofng/common/hwcdrv.c
-+++ b/gprofng/common/hwcdrv.c
-@@ -650,6 +650,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue,
- static void
- dump_perf_event_attr (struct perf_event_attr *at)
- {
-+#if defined(DEBUG)
-   TprintfT (DBG_LT2, "dump_perf_event_attr:  size=%d  type=%d  sample_period=%lld\n"
- 	    "  config=0x%llx  config1=0x%llx  config2=0x%llx  wakeup_events=%lld __reserved_1=%lld\n",
- 	    (int) at->size, (int) at->type, (unsigned long long) at->sample_period,
-@@ -665,13 +666,13 @@ dump_perf_event_attr (struct perf_event_attr *at)
-   DUMP_F (exclude_kernel);
-   DUMP_F (exclude_hv);
-   DUMP_F (exclude_idle);
-  //    DUMP_F(xmmap);
-   DUMP_F (comm);
-   DUMP_F (freq);
-   DUMP_F (inherit_stat);
-   DUMP_F (enable_on_exec);
-   DUMP_F (task);
-   DUMP_F (watermark);
-+#endif
- }
- 
- static void
-diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h
-index a35a363e693..7899875cf96 100644
--- a/gprofng/common/hwcentry.h
-+++ b/gprofng/common/hwcentry.h
-@@ -202,17 +202,12 @@ extern "C"
-   extern char *hwc_get_docref (char *buf, size_t buflen);
-   /* Return a CPU HWC document reference, or NULL. */
- 
-  // TBR
-  extern char *hwc_get_default_cntrs ();
-  /* Return a default HW counter string; may be NULL, or zero-length */
-  /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */
-
-   extern char *hwc_get_default_cntrs2 (int forKernel, int style);
-   /* like hwc_get_default_cntrs() for style==1 */
-   /* but allows other styles of formatting as well */
-   /* deprecate and eventually remove hwc_get_default_cntrs() */
- 
-  extern char *hwc_get_orig_default_cntrs ();
-+  extern char *hwc_get_orig_default_cntrs (int forKernel);
-   /* Get the default HW counter string as set in the table */
-   /* NULL means none is defined in the table */
- 
-diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c
-index d0735132fac..fe9153190e7 100644
--- a/gprofng/common/hwctable.c
-+++ b/gprofng/common/hwctable.c
-@@ -3231,7 +3231,7 @@ check_tables ()
- }
- #endif
- 
-static int try_a_counter ();
-+static int try_a_counter (int forKernel);
- static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out,
- 				  Hwcentry ***praw_out, Hwcentry ***phidden_out,
- 				  Hwcentry**static_tables,
-@@ -4321,17 +4321,6 @@ hwc_get_docref (char *buf, size_t buflen)
-   return buf;
- }
- 
-//TBR:
-
-extern char*
-hwc_get_default_cntrs ()
-{
-  setup_cpcx ();
-  if (cpcx_default_hwcs[0] != NULL)
-    return strdup (cpcx_default_hwcs[0]); // TBR deprecate this
-  return NULL;
-}
-
- extern char*
- hwc_get_default_cntrs2 (int forKernel, int style)
- {
-diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
-index 39529758600..ef580dcbdd9 100644
--- a/gprofng/libcollector/collector.c
-+++ b/gprofng/libcollector/collector.c
-@@ -210,15 +210,10 @@ get_collector_interface ()
- static void
- collector_module_init (CollectorInterface *col_intf)
- {
-  int nmodules = 0;
-
-   ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init");
-   if (next_init != NULL)
-    {
-      nmodules++;
-      next_init (col_intf);
-    }
-  TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules);
-+    next_init (col_intf);
-+  TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0);
- }
- 
- /*   Routines concerned with general experiment start and stop */
-@@ -1784,7 +1779,7 @@ __collector_pause ()
- }
- 
- void
-__collector_pause_m (char *reason)
-+__collector_pause_m (const char *reason)
- {
-   hrtime_t now;
-   char xreason[MAXPATHLEN];
-@@ -2451,8 +2446,8 @@ __collector_dlog (int tflag, int level, char *format, ...)
- 
- static void (*__real__exit) (int status) = NULL; /* libc only: _exit */
- static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */
-void _exit () __attribute__ ((weak, alias ("__collector_exit")));
-void _Exit () __attribute__ ((weak, alias ("__collector_Exit")));
-+void _exit (int status) __attribute__ ((weak, alias ("__collector_exit")));
-+void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit")));
- 
- void
- __collector_exit (int status)
-diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h
-index 07a03bdd17a..eda68a0e4f5 100644
--- a/gprofng/libcollector/collector.h
-+++ b/gprofng/libcollector/collector.h
-@@ -123,7 +123,7 @@ extern void __collector_terminate_expt ();
- extern void __collector_terminate_hook ();
- extern void __collector_sample (char *name);
- extern void __collector_pause ();
-extern void __collector_pause_m ();
-+extern void __collector_pause_m (const char *reason);
- extern void __collector_resume ();
- extern int collector_sigemt_sigaction (const struct sigaction*,
- 				       struct sigaction*);
-diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c
-index 5fa6403ad49..449bbbaab65 100644
--- a/gprofng/libcollector/collectorAPI.c
-+++ b/gprofng/libcollector/collectorAPI.c
-@@ -26,16 +26,17 @@
- #include "collectorAPI.h"
- #include "gp-experiment.h"
- 
-static void *__real_collector_sample = NULL;
-static void *__real_collector_pause = NULL;
-static void *__real_collector_resume = NULL;
-static void *__real_collector_terminate_expt = NULL;
-static void *__real_collector_func_load = NULL;
-static void *__real_collector_func_unload = NULL;
-+static void (*__real_collector_sample)(const char *) = NULL;
-+static void (*__real_collector_pause)() = NULL;
-+static void (*__real_collector_resume)() = NULL;
-+static void (*__real_collector_terminate_expt)() = NULL;
-+static void (*__real_collector_func_load)(const char *, const char *,
-+		const char *, void *, int, int, Lineno *) = NULL;
-+static void (*__real_collector_func_unload)(void *) = NULL;
- 
- #define INIT_API        if (init_API == 0) collectorAPI_initAPI()
- #define NULL_PTR(x)     (__real_##x == NULL)
-#define CALL_REAL(x)    (*(void(*)())__real_##x)
-+#define CALL_REAL(x)    (__real_##x)
- #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x)
- 
- static int init_API = 0;
-diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c
-index d2a4ad0b60b..867753a22ec 100644
--- a/gprofng/libcollector/dispatcher.c
-+++ b/gprofng/libcollector/dispatcher.c
-@@ -909,8 +909,9 @@ sigset (int sig, sighandler_t handler)
- 
- // map interposed symbol versions
- static int
-gprofng_timer_create (int (real_func) (), clockid_t clockid,
-                      struct sigevent *sevp, timer_t *timerid)
-+gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *),
-+		      clockid_t clockid,
-+		      struct sigevent *sevp, timer_t *timerid)
- {
-   // collector reserves SIGPROF
-   if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL ||
-@@ -1045,7 +1046,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset)
- // map interposed symbol versions
- 
- static int
-gprofng_pthread_sigmask (int (real_func) (),
-+gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*),
-                          int how, const sigset_t *iset, sigset_t* oset)
- {
-   sigset_t lsigset;
-@@ -1140,9 +1141,10 @@ collector_root (void *cargs)
- // map interposed symbol versions
- 
- static int
-gprofng_pthread_create (int (real_func) (), pthread_t *thread,
-                        const pthread_attr_t *attr,
-                        void *(*func)(void*), void *arg)
-+gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *,
-+					 void *(*)(void *), void *),
-+			pthread_t *thread, const pthread_attr_t *attr,
-+			void *(*func)(void*), void *arg)
- {
-   TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func);
-   if (dispatch_mode != DISPATCH_ON)
-@@ -1277,6 +1279,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags,
- }
- 
- // weak symbols:
-int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask")));
-int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
-+int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask")));
-+int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
- int setitimer () __attribute__ ((weak, alias ("_setitimer")));
-+
-diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c
-index 18060864796..3deb441d9c7 100644
--- a/gprofng/libcollector/iotrace.c
-+++ b/gprofng/libcollector/iotrace.c
-@@ -1350,7 +1350,7 @@ mkstemp (char *template)
-   unsigned pktSize;
-   if (NULL_PTR (mkstemp))
-     init_io_intf ();
-  if (CHCK_REENTRANCE (guard) || template == NULL)
-+  if (CHCK_REENTRANCE (guard))
-     return CALL_REAL (mkstemp)(template);
-   PUSH_REENTRANCE (guard);
-   hrtime_t reqt = gethrtime ();
-@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen)
-   unsigned pktSize;
-   if (NULL_PTR (mkstemps))
-     init_io_intf ();
-  if (CHCK_REENTRANCE (guard) || template == NULL)
-+  if (CHCK_REENTRANCE (guard))
-     return CALL_REAL (mkstemps)(template, slen);
-   PUSH_REENTRANCE (guard);
-   hrtime_t reqt = gethrtime ();
-@@ -1485,7 +1485,7 @@ close (int fildes)
- 
- /*------------------------------------------------------------- fopen */
- static FILE*
-gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode)
-+gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode)
- {
-   int *guard;
-   FILE *fp = NULL;
-@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen)
- 
- /*------------------------------------------------------------- fclose */
- static int
-gprofng_fclose (int(real_fclose) (), FILE *stream)
-+gprofng_fclose (int(real_fclose) (FILE *), FILE *stream)
- {
-   int *guard;
-   int stat;
-@@ -1645,7 +1645,7 @@ fflush (FILE *stream)
- 
- /*------------------------------------------------------------- fdopen */
- static FILE*
-gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode)
-+gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode)
- {
-   int *guard;
-   FILE *fp = NULL;
-@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos)
- 
- /*------------------------------------------------------------- fgetpos64 */
- static int
-gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos)
-+gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos)
- {
-   int *guard;
-   int ret;
-diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
-index 15ba24d2ab5..c2b82894e6b 100644
--- a/gprofng/libcollector/libcol_util.c
-+++ b/gprofng/libcollector/libcol_util.c
-@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...)
-   mode_t mode = 0;
- 
-   hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC);
-  int nretries = 0;
-   long long delay = 100; /* start at some small, arbitrary value */
- 
-   /* get optional mode argument if it's expected/required */
-@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...)
-       delay *= 2;
-       if (delay > 100000000)
- 	delay = 100000000; /* cap at some large, arbitrary value */
-      nretries++;
-     }
-   return fd;
- }
-diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h
-index 2eeeaeed50b..1b1b928180a 100644
--- a/gprofng/libcollector/libcol_util.h
-+++ b/gprofng/libcollector/libcol_util.h
-@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp);
- #define __collector_mutex_init(xx) \
-   do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0)
- 
-void __collector_sample (char *name);
-void __collector_terminate_expt ();
-void __collector_pause ();
-void __collector_pause_m ();
-void __collector_resume ();
-
- struct DT_lineno;
- 
- typedef enum
-diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c
-index 67b2d7e9030..66844bc1337 100644
--- a/gprofng/libcollector/linetrace.c
-+++ b/gprofng/libcollector/linetrace.c
-@@ -1207,7 +1207,7 @@ __collector_vfork (void)
- }
- 
- /*------------------------------------------------------------- execve */
-int execve () __attribute__ ((weak, alias ("__collector_execve")));
-+int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve")));
- 
- int
- __collector_execve (const char* path, char *const argv[], char *const envp[])
-@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[])
-   return ret;
- }
- 
-int execvp () __attribute__ ((weak, alias ("__collector_execvp")));
-+int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp")));
- 
- int
- __collector_execvp (const char* file, char *const argv[])
-@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[])
-   return ret;
- }
- 
-int execv () __attribute__ ((weak, alias ("__collector_execv")));
-+int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv")));
- 
- int
- __collector_execv (const char* path, char *const argv[])
-@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...)
- /*-------------------------------------------------------- posix_spawn */
- // map interposed symbol versions
- static int
-gprofng_posix_spawn (int(real_posix_spawn) (),
-+gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *,
-+				const posix_spawn_file_actions_t *,
-+				const posix_spawnattr_t *,
-+				char *const [], char *const []),
- 		     pid_t *pidp, const char *path,
- 		     const posix_spawn_file_actions_t *file_actions,
- 		     const posix_spawnattr_t *attrp,
-@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn)
- 
- /*-------------------------------------------------------- posix_spawnp */
- static int
-gprofng_posix_spawnp (int (real_posix_spawnp) (),
-+gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *,
-+				const posix_spawn_file_actions_t *,
-+				const posix_spawnattr_t *,
-+				char *const [], char *const []),
-                       pid_t *pidp, const char *path,
-                       const posix_spawn_file_actions_t *file_actions,
-                       const posix_spawnattr_t *attrp,
-@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg,
- }
- 
- /*-------------------------------------------------------------------- setuid */
-int setuid () __attribute__ ((weak, alias ("__collector_setuid")));
-int _setuid () __attribute__ ((weak, alias ("__collector_setuid")));
-+int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid")));
-+int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid")));
- 
- int
- __collector_setuid (uid_t ruid)
-@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid)
- }
- 
- /*------------------------------------------------------------------- seteuid */
-int seteuid () __attribute__ ((weak, alias ("__collector_seteuid")));
-int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid")));
-+int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid")));
-+int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid")));
- 
- int
- __collector_seteuid (uid_t euid)
-@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid)
- }
- 
- /*------------------------------------------------------------------ setreuid */
-int setreuid () __attribute__ ((weak, alias ("__collector_setreuid")));
-int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid")));
-+int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid")));
-+int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid")));
- 
- int
- __collector_setreuid (uid_t ruid, uid_t euid)
-@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid)
- }
- 
- /*-------------------------------------------------------------------- setgid */
-int setgid () __attribute__ ((weak, alias ("__collector_setgid")));
-int _setgid () __attribute__ ((weak, alias ("__collector_setgid")));
-+int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid")));
-+int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid")));
- 
- int
- __collector_setgid (gid_t rgid)
-@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid)
- }
- 
- /*------------------------------------------------------------------- setegid */
-int setegid () __attribute__ ((weak, alias ("__collector_setegid")));
-int _setegid () __attribute__ ((weak, alias ("__collector_setegid")));
-+int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid")));
-+int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid")));
- 
- int
- __collector_setegid (gid_t egid)
-@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid)
- }
- 
- /*------------------------------------------------------------------ setregid */
-int setregid () __attribute__ ((weak, alias ("__collector_setregid")));
-int _setregid () __attribute__ ((weak, alias ("__collector_setregid")));
-+int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid")));
-+int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid")));
- 
- int
- __collector_setregid (gid_t rgid, gid_t egid)
-diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h
-index d73d244e27e..7698f9c6eaf 100644
--- a/gprofng/src/BaseMetricTreeNode.h
-+++ b/gprofng/src/BaseMetricTreeNode.h
-@@ -85,7 +85,6 @@ private:
- 
-   BaseMetricTreeNode *root;     // root of tree
-   BaseMetricTreeNode *parent;   // my parent
-  bool aggregation;             // value is based on children's values
-   char *name;           // bm->get_cmd() for metrics, unique string otherwise
-   char *uname;                  // user-visible text
-   char *unit;                   // see UNIT_* defines
-diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc
-index 91a5aa5ef05..bcbf4694565 100644
--- a/gprofng/src/Dbe.cc
-+++ b/gprofng/src/Dbe.cc
-@@ -9594,14 +9594,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta,
- 	}
-       if (sampleVals != NULL)
- 	{
-	  Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx);
-	  if (!sample || !sample->get_usage ())
-	    sample = sample;
-	  else
-+	  Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx);
-+	  if (sample != NULL)
- 	    {
-	      PrUsage* prusage = sample->get_usage ();
-	      Vector<long long> *mstateVals = prusage->getMstateValues ();
-	      sampleVals->store (eventIdx, mstateVals);
-+	      PrUsage *prusage = sample->get_usage ();
-+	      if (prusage != NULL)
-+		sampleVals->store (eventIdx, prusage->getMstateValues ());
- 	    }
- 	}
-     }
-diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc
-index 20329091167..5d6bab75638 100644
--- a/gprofng/src/DbeSession.cc
-+++ b/gprofng/src/DbeSession.cc
-@@ -1162,8 +1162,6 @@ DbeSession::open_experiment (Experiment *exp, char *path)
-   closedir (exp_dir);
-   exp_names->sort (dir_name_cmp);
-   Experiment **t_exp_list = new Experiment *[exp_names->size ()];
-  int nsubexps = 0;
-
-   for (int j = 0, jsz = exp_names->size (); j < jsz; j++)
-     {
-       t_exp_list[j] = NULL;
-@@ -1220,7 +1218,6 @@ DbeSession::open_experiment (Experiment *exp, char *path)
- 	dexp->open (dpath);
-       append (dexp);
-       t_exp_list[j] = dexp;
-      nsubexps++;
-       dexp->set_clock (exp->clock);
- 
-       // DbeView add_experiment() is split into two parts
-diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc
-index 1396e4fb072..d78212cee39 100644
--- a/gprofng/src/Disasm.cc
-+++ b/gprofng/src/Disasm.cc
-@@ -49,7 +49,6 @@ struct DisContext
- };
- 
- static const int MAX_DISASM_STR     = 2048;
-static const int MAX_INSTR_SIZE     = 8;
- 
- Disasm::Disasm (char *fname)
- {
-diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc
-index 02a24ebc40d..a31550aff66 100644
--- a/gprofng/src/Experiment.cc
-+++ b/gprofng/src/Experiment.cc
-@@ -1935,8 +1935,6 @@ private:
-   }
- 
-   Experiment *exp;
-  char *hostname;
-  hrtime_t time, tstamp;
- };
- 
- void
-diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h
-index 918c0dc95f9..c5fdd345ba8 100644
--- a/gprofng/src/HashMap.h
-+++ b/gprofng/src/HashMap.h
-@@ -78,9 +78,8 @@ copy_key (uint64_t a)
- }
- 
- template<> inline void
-delete_key (uint64_t a)
-+delete_key (uint64_t)
- {
-  a = a;
- }
- 
- template<> inline int
-diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h
-index cf462cf8d55..f3a22ada6b1 100644
--- a/gprofng/src/IOActivity.h
-+++ b/gprofng/src/IOActivity.h
-@@ -78,7 +78,6 @@ private:
-   Hist_data *hist_data_file_all;
-   Hist_data *hist_data_vfd_all;
-   Hist_data *hist_data_callstack_all;
-  Hist_data *hist_data_callstack;
- 
-   DbeView *dbev;
- };
-diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc
-index ebf888c5a20..b0ed66efcdc 100644
--- a/gprofng/src/collctrl.cc
-+++ b/gprofng/src/collctrl.cc
-@@ -952,9 +952,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn)
-       double dval = strtod (string, &endchar);
-       if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */
- 	dval = dval * 1000.;
-      else if (*endchar == 'u')     /* user specified microseconds */
-	dval = dval;
-      else
-+      else if (*endchar != 'u')
- 	return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string);
-       nclkprof_timer = (int) (dval + 0.5);
-     }
-@@ -2901,7 +2899,7 @@ Coll_Ctrl::get (char * control)
-     }
-   if (!strncmp (control, ipc_str_javaprof, len))
-     {
-      if ((java_mode == 0))
-+      if (java_mode == 0)
- 	return strdup (ipc_str_off);
-       return strdup (ipc_str_on);
-     }
-@@ -2917,7 +2915,7 @@ Coll_Ctrl::get (char * control)
-     }
-   if (!strncmp (control, ipc_str_sample_sig, len))
-     {
-      if ((sample_sig == 0))
-+      if (sample_sig == 0)
- 	return strdup (ipc_str_off);
-       char *str_signal = find_signal_name (sample_sig);
-       if (str_signal != NULL)
-@@ -2951,15 +2949,15 @@ Coll_Ctrl::get (char * control)
-     }
-   if (!strncmp (control, ipc_str_iotrace, len))
-     {
-      if ((iotrace_enabled == 0))
-+      if (iotrace_enabled == 0)
- 	return strdup (ipc_str_off);
-       return strdup (ipc_str_on);
-     }
-   if (!strncmp (control, ipc_str_count, len))
-     {
-      if ((count_enabled == 0))
-+      if (count_enabled == 0)
- 	return strdup (ipc_str_off);
-      if ((count_enabled < 0))
-+      if (count_enabled < 0)
- 	return strdup ("on\nstatic");
-       return strdup (ipc_str_on);
-     }
-diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
-index bb48eadb9f8..ebcdbca561f 100644
--- a/gprofng/src/collector_module.h
-+++ b/gprofng/src/collector_module.h
-@@ -40,12 +40,12 @@ struct tm;
-  * If you add any, please put it in the right place */
- typedef struct CollectorUtilFuncs
- {
-  int (*access)();
-+  int (*access)(const char *, int);
-   int (*atoi)(const char *nptr);
-   void *(*calloc)(size_t nelem, size_t elsize);
-   int (*clearenv)(void);
-   int (*close)(int);
-  int (*closedir)();
-+  int (*closedir)(DIR *);
-   int (*execv)(const char *path, char *const argv[]);
-   void (*exit)(int status);
-   int (*fclose)(FILE *stream);
-@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs
-   off_t (*lseek)(int fd, off_t offset, int whence);
-   void *(*malloc)(size_t size);
-   void *(*memset)(void *s1, int c, size_t n);
-  int (*mkdir)();
-+  int (*mkdir)(const char *, mode_t);
-   time_t (*mktime)(struct tm *timeptr);
-   void *(*mmap)(void *, size_t, int, int, int, off_t);
-  void *(*mmap64_)();
-  int (*munmap)();
-+  void *(*mmap64_)(void *, size_t, int, int, int, off_t);
-+  int (*munmap)(void *, size_t);
-   int (*open)(const char *, int, ...);
-   int (*open_bare)(const char *, int, ...);
-  DIR *(*opendir)();
-+  DIR *(*opendir)(const char *);
-   int (*pclose)(FILE *stream);
-   FILE *(*popen)(const char *command, const char *mode);
-   int (*putenv)(char *string);
-  ssize_t (*pwrite)();
-  ssize_t (*pwrite64_)();
-  ssize_t (*read)();
-+  ssize_t (*pwrite)(int, const void *, size_t, off_t);
-+  ssize_t (*pwrite64_)(int, const void *, size_t, off_t);
-+  ssize_t (*read)(int, void *, size_t);
-   int (*setenv)(const char *name, const char *value, int overwrite);
-   int (*sigfillset)(sigset_t *set);
-   int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset);
-@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs
-   int (*unsetenv)(const char *name);
-   int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap);
-   pid_t (*waitpid)(pid_t pid, int *stat_loc, int options);
-  ssize_t (*write)();
-+  ssize_t (*write)(int, void *, size_t);
-   double (*atof)();
-   void *n_a;
- } CollectorUtilFuncs;
-diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc
-index 200e6080d2e..24af375edf1 100644
--- a/gprofng/src/gp-display-src.cc
-+++ b/gprofng/src/gp-display-src.cc
-@@ -75,14 +75,6 @@ private:
-   bool v_opt;
-   int multiple;
-   char *str_compcom;
-  bool hex_visible;
-  int src_visible;
-  int vis_src;
-  int vis_dis;
-  int threshold_src;
-  int threshold_dis;
-  int threshold;
-  int vis_bits;
- };
- 
- static int
-diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h
-index 1b748ea60a3..1a8ad3b6c13 100644
--- a/gprofng/src/gp-print.h
-+++ b/gprofng/src/gp-print.h
-@@ -19,7 +19,7 @@
-    MA 02110-1301, USA.  */
- 
- #ifndef _GP_PRINT_H
-#define _ER_PRINT_H
-+#define _GP_PRINT_H
- 
- #include "Command.h"
- #include "DbeApplication.h"
-diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc
-index 201f7088b66..228140b61ae 100644
--- a/gprofng/src/util.cc
-+++ b/gprofng/src/util.cc
-@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to)
-   s2 = canonical_path (s2);
-   long l = dbe_sstrlen (s1);
-   // try to find common directories
-  int common_slashes = 0;
-   int last_common_slash = -1;
-   for (int i = 0; i < l; i++)
-     {
-      if (s1[i] != s2[i]) break;
-      if (s1[i] == 0) break;
-+      if (s1[i] != s2[i] || s1[i] == 0)
-+	break;
-       if (s1[i] == '/')
-	{
-	  common_slashes++;
-	  last_common_slash = i;
-	}
-+	last_common_slash = i;
-     }
-   // find slashes in remaining path_to
-   int slashes = 0;
-- 
-2.50.1
-
@@ -1,619 +0,0 @@
-From 2e59be3bc9dad69af4f62d26107b6ace23e9998a Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 16 Nov 2024 05:13:48 +0000
-Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped
- functions
-
-C23 removes support for unprototyped functions. Fix function pointer types
-accordingly.
-
-This does not fix all instances, there's a few left as I commented on in
-PR32374 (e.g. setitimer which I have a local workaround for but it involves
-a glibc implementation detail; the Linaro precommit CI tester pointed that
-out too, so dropped that).
-
-ChangeLog:
-	PR gprofng/32374
-
-	* libcollector/collector.c (collector_sample): Fix prototype.
-	* libcollector/envmgmt.c (putenv): Ditto.
-	(_putenv): Ditto.
-	(__collector_putenv): Ditto.
-	(setenv): Ditto.
-	(_setenv): Ditto.
-	(__collector_setenv): Ditto.
-	(unsetenv): Ditto.
-	(_unsetenv): Ditto.
-	(__collector_unsetenv): Ditto.
-	* libcollector/jprofile.c (open_experiment): Ditto.
-	(__collector_jprofile_enable_synctrace): Ditto.
-	(jprof_find_asyncgetcalltrace): Ditto.
-	* libcollector/libcol_util.c (__collector_util_init): Ditto.
-	(ARCH): Ditto.
-	* libcollector/mmaptrace.c (collector_func_load): Ditto.
-	(collector_func_unload): Ditto.
-	* libcollector/unwind.c (__collector_ext_unwind_init): Ditto.
-	* src/collector_module.h: Ditto.
-
-Upstream: a2f774427e078f3da2c06bdea25f77a61979a695
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- gprofng/libcollector/collector.c   |  2 +-
- gprofng/libcollector/dispatcher.c  |  1 -
- gprofng/libcollector/envmgmt.c     | 24 ++++-----
- gprofng/libcollector/jprofile.c    | 10 ++--
- gprofng/libcollector/libcol_util.c | 84 +++++++++++++++---------------
- gprofng/libcollector/mmaptrace.c   |  4 +-
- gprofng/libcollector/unwind.c      |  2 +-
- gprofng/src/collector_module.h     |  2 +-
- 8 files changed, 64 insertions(+), 65 deletions(-)
-
-diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
-index ef580dcbdd9..899f08a5381 100644
--- a/gprofng/libcollector/collector.c
-+++ b/gprofng/libcollector/collector.c
-@@ -1579,7 +1579,7 @@ __collector_resume_experiment ()
- }
- 
- /* Code to support Samples and Pause/Resume */
-void collector_sample () __attribute__ ((weak, alias ("__collector_sample")));
-+void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample")));
- void
- __collector_sample (char *name)
- {
-diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c
-index 867753a22ec..5ee0bf895bf 100644
--- a/gprofng/libcollector/dispatcher.c
-+++ b/gprofng/libcollector/dispatcher.c
-@@ -1282,4 +1282,3 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags,
- int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask")));
- int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
- int setitimer () __attribute__ ((weak, alias ("_setitimer")));
-
-diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c
-index ebe08f82007..0ff7621070d 100644
--- a/gprofng/libcollector/envmgmt.c
-+++ b/gprofng/libcollector/envmgmt.c
-@@ -692,8 +692,8 @@ __collector_env_update (char *envp[])
- 
- 
- /*------------------------------------------------------------- putenv */
-int putenv () __attribute__ ((weak, alias ("__collector_putenv")));
-int _putenv () __attribute__ ((weak, alias ("__collector_putenv")));
-+int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv")));
-+int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv")));
- 
- int
- __collector_putenv (char * string)
-@@ -701,9 +701,9 @@ __collector_putenv (char * string)
-   if (CALL_UTIL (putenv) == __collector_putenv ||
-       CALL_UTIL (putenv) == NULL)
-     { // __collector_libc_funcs_init failed
-      CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv");
-+      CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv");
-       if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv)
-	  CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv");
-+	  CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv");
-       if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv)
- 	{
- 	  TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n");
-@@ -719,8 +719,8 @@ __collector_putenv (char * string)
- }
- 
- /*------------------------------------------------------------- setenv */
-int setenv () __attribute__ ((weak, alias ("__collector_setenv")));
-int _setenv () __attribute__ ((weak, alias ("__collector_setenv")));
-+int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv")));
-+int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv")));
- 
- int
- __collector_setenv (const char *name, const char *value, int overwrite)
-@@ -728,9 +728,9 @@ __collector_setenv (const char *name, const char *value, int overwrite)
-   if (CALL_UTIL (setenv) == __collector_setenv ||
-       CALL_UTIL (setenv) == NULL)
-     { // __collector_libc_funcs_init failed
-      CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv");
-+      CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv");
-       if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv)
-	CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv");
-+	CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv");
-       if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv)
- 	{
- 	  TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n");
-@@ -765,8 +765,8 @@ __collector_setenv (const char *name, const char *value, int overwrite)
- }
- 
- /*------------------------------------------------------------- unsetenv */
-int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv")));
-int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv")));
-+int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv")));
-+int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv")));
- 
- int
- __collector_unsetenv (const char *name)
-@@ -774,9 +774,9 @@ __collector_unsetenv (const char *name)
-   if (CALL_UTIL (unsetenv) == __collector_unsetenv ||
-       CALL_UTIL (unsetenv) == NULL)
-     { // __collector_libc_funcs_init failed
-      CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv");
-+      CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv");
-       if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv)
-	CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv");
-+	CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv");
-       if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv)
- 	{
- 	  TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n");
-diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c
-index 1bacacc1a2a..11051f937ef 100644
--- a/gprofng/libcollector/jprofile.c
-+++ b/gprofng/libcollector/jprofile.c
-@@ -105,8 +105,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte);
- static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len);
- static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL;
- static void (*collector_heap_record)(int, int, void*) = NULL;
-static void (*collector_jsync_begin)() = NULL;
-static void (*collector_jsync_end)(hrtime_t, void *) = NULL;
-+static void (*collector_jsync_begin)(void) = NULL;
-+static void (*collector_jsync_end)(hrtime_t, void*) = NULL;
- 
- #define gethrtime collector_interface->getHiResTime
- 
-@@ -230,7 +230,7 @@ open_experiment (const char *exp)
-       else if (__collector_strStartWith (args, "s:") == 0)
- 	{
- 	  java_sync_mode = 1;
-	  collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
-+	  collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
- 	  collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end");
- 	}
- #endif
-@@ -255,7 +255,7 @@ __collector_jprofile_enable_synctrace ()
-       return;
-     }
-   java_sync_mode = 1;
-  collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
-+  collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
-   collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end");
-   TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n");
- }
-@@ -1129,7 +1129,7 @@ jprof_find_asyncgetcalltrace ()
- {
-   void *jvmhandle;
-   if (__collector_VM_ReadByteInstruction == NULL)
-    __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
-+    __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
- 
-   /* look for stack unwind function using default path */
-   AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*))
-diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
-index c2b82894e6b..688bdf19c6d 100644
--- a/gprofng/libcollector/libcol_util.c
-+++ b/gprofng/libcollector/libcol_util.c
-@@ -1114,7 +1114,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "munmap");
-   if (ptr)
-    __collector_util_funcs.munmap = (int(*)())ptr;
-+    __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ());
-@@ -1123,7 +1123,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "close");
-   if (ptr)
-    __collector_util_funcs.close = (int(*)())ptr;
-+    __collector_util_funcs.close = (int(*)(int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ());
-@@ -1158,7 +1158,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "close");
-   if (ptr)
-    __collector_util_funcs.close = (int(*)())ptr;
-+    __collector_util_funcs.close = (int(*)(int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ());
-@@ -1167,7 +1167,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "read");
-   if (ptr)
-    __collector_util_funcs.read = (ssize_t (*)())ptr;
-+    __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ());
-@@ -1176,7 +1176,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "write");
-   if (ptr)
-    __collector_util_funcs.write = (ssize_t (*)())ptr;
-+    __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ());
-@@ -1186,14 +1186,14 @@ __collector_util_init ()
- #if ARCH(Intel) && WSIZE(32)
-   ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0
-   if (ptr)
-    __collector_util_funcs.pwrite = (ssize_t (*)())ptr;
-+    __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr;
-   else
-     {
-       Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2");
- #endif /* ARCH(Intel) && WSIZE(32) */
-       ptr = dlsym (libc, "pwrite");
-       if (ptr)
-	__collector_util_funcs.pwrite = (ssize_t (*)())ptr;
-+	__collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr;
-       else
- 	{
- 	  CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ());
-@@ -1213,7 +1213,7 @@ __collector_util_init ()
- #endif /* ARCH(Intel) && WSIZE(32) */
-       ptr = dlsym (libc, "pwrite64");
-       if (ptr)
-	__collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr;
-+	__collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr;
-       else
- 	__collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite;
- #if ARCH(Intel) && WSIZE(32)
-@@ -1222,7 +1222,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "lseek");
-   if (ptr)
-    __collector_util_funcs.lseek = (off_t (*)())ptr;
-+    __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ());
-@@ -1231,7 +1231,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "access");
-   if (ptr)
-    __collector_util_funcs.access = (int(*)())ptr;
-+    __collector_util_funcs.access = (int(*)(const char*, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ());
-@@ -1240,7 +1240,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "mkdir");
-   if (ptr)
-    __collector_util_funcs.mkdir = (int(*)())ptr;
-+    __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ());
-@@ -1249,7 +1249,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "opendir");
-   if (ptr)
-    __collector_util_funcs.opendir = (DIR * (*)())ptr;
-+    __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ());
-@@ -1258,7 +1258,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "closedir");
-   if (ptr)
-    __collector_util_funcs.closedir = (int(*)())ptr;
-+    __collector_util_funcs.closedir = (int(*)(DIR*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ());
-@@ -1267,7 +1267,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "execv");
-   if (ptr)
-    __collector_util_funcs.execv = (int(*)())ptr;
-+    __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ());
-@@ -1276,7 +1276,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "exit");
-   if (ptr)
-    __collector_util_funcs.exit = (void(*)())ptr;
-+    __collector_util_funcs.exit = (void(*)(int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ());
-@@ -1285,7 +1285,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "vfork");
-   if (ptr)
-    __collector_util_funcs.vfork = (pid_t (*)())ptr;
-+    __collector_util_funcs.vfork = (pid_t (*)(void))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ());
-@@ -1294,7 +1294,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "waitpid");
-   if (ptr)
-    __collector_util_funcs.waitpid = (pid_t (*)())ptr;
-+    __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ());
-@@ -1313,7 +1313,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "getcontext");
-   if (ptr)
-    __collector_util_funcs.getcontext = (int(*)())ptr;
-+    __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ());
-@@ -1331,7 +1331,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "putenv");
-   if (ptr)
-    __collector_util_funcs.putenv = (int(*)())ptr;
-+    __collector_util_funcs.putenv = (int(*)(char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ());
-@@ -1340,7 +1340,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "getenv");
-   if (ptr)
-    __collector_util_funcs.getenv = (char*(*)())ptr;
-+    __collector_util_funcs.getenv = (char*(*)(const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ());
-@@ -1349,7 +1349,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "time");
-   if (ptr)
-    __collector_util_funcs.time = (time_t (*)())ptr;
-+    __collector_util_funcs.time = (time_t (*)(time_t*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ());
-@@ -1358,7 +1358,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "mktime");
-   if (ptr)
-    __collector_util_funcs.mktime = (time_t (*)())ptr;
-+    __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ());
-@@ -1372,7 +1372,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "gmtime_r");
-   if (ptr)
-    __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr;
-+    __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ());
-@@ -1381,7 +1381,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strtol");
-   if (ptr)
-    __collector_util_funcs.strtol = (long (*)())ptr;
-+    __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ());
-@@ -1390,7 +1390,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strtoll");
-   if (ptr)
-    __collector_util_funcs.strtoll = (long long (*)())ptr;
-+    __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ());
-@@ -1402,7 +1402,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "setenv");
-   if (ptr)
-    __collector_util_funcs.setenv = (int(*)())ptr;
-+    __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ());
-@@ -1411,7 +1411,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "unsetenv");
-   if (ptr)
-    __collector_util_funcs.unsetenv = (int(*)())ptr;
-+    __collector_util_funcs.unsetenv = (int(*)(const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ());
-@@ -1498,7 +1498,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "pclose");
-   if (ptr)
-    __collector_util_funcs.pclose = (int(*)())ptr;
-+    __collector_util_funcs.pclose = (int(*)(FILE*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ());
-@@ -1507,7 +1507,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "fgets");
-   if (ptr)
-    __collector_util_funcs.fgets = (char*(*)())ptr;
-+    __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ());
-@@ -1534,7 +1534,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "vsnprintf");
-   if (ptr)
-    __collector_util_funcs.vsnprintf = (int(*)())ptr;
-+    __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ());
-@@ -1543,7 +1543,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "atoi");
-   if (ptr)
-    __collector_util_funcs.atoi = (int(*)())ptr;
-+    __collector_util_funcs.atoi = (int(*)(const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ());
-@@ -1552,7 +1552,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "calloc");
-   if (ptr)
-    __collector_util_funcs.calloc = (void*(*)())ptr;
-+    __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ());
-@@ -1562,7 +1562,7 @@ __collector_util_init ()
-   ptr = dlsym (libc, "free");
-   if (ptr)
-     {
-      __collector_util_funcs.free = (void(*)())ptr;
-+      __collector_util_funcs.free = (void(*)(void*))ptr;
-     }
-   else
-     {
-@@ -1572,7 +1572,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strdup");
-   if (ptr)
-    __collector_util_funcs.libc_strdup = (char*(*)())ptr;
-+    __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ());
-@@ -1585,7 +1585,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strerror");
-   if (ptr)
-    __collector_util_funcs.strerror = (char*(*)())ptr;
-+    __collector_util_funcs.strerror = (char*(*)(int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ());
-@@ -1593,7 +1593,7 @@ __collector_util_init ()
-     }
-   ptr = dlsym (libc, "strerror_r");
-   if (ptr)
-    __collector_util_funcs.strerror_r = (int(*)())ptr;
-+    __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ());
-@@ -1601,7 +1601,7 @@ __collector_util_init ()
-     }
-   ptr = dlsym (libc, "strspn");
-   if (ptr)
-    __collector_util_funcs.strspn = (size_t (*)())ptr;
-+    __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ());
-@@ -1610,7 +1610,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strtoul");
-   if (ptr)
-    __collector_util_funcs.strtoul = (unsigned long int(*)())ptr;
-+    __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ());
-@@ -1619,7 +1619,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "strtoull");
-   if (ptr)
-    __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr;
-+    __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ());
-@@ -1664,7 +1664,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "sysconf");
-   if (ptr)
-    __collector_util_funcs.sysconf = (long(*)())ptr;
-+    __collector_util_funcs.sysconf = (long(*)(int))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ());
-@@ -1673,7 +1673,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "sigfillset");
-   if (ptr)
-    __collector_util_funcs.sigfillset = (int(*)())ptr;
-+    __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ());
-@@ -1682,7 +1682,7 @@ __collector_util_init ()
- 
-   ptr = dlsym (libc, "sigprocmask");
-   if (ptr)
-    __collector_util_funcs.sigprocmask = (int(*)())ptr;
-+    __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr;
-   else
-     {
-       CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ());
-diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c
-index f07f4d76513..2a6857ab58e 100644
--- a/gprofng/libcollector/mmaptrace.c
-+++ b/gprofng/libcollector/mmaptrace.c
-@@ -1209,7 +1209,7 @@ process_vsyscall_page ()
- /*
-  * collector API for dynamic functions
-  */
-void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load")));
-+void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load")));
- void
- __collector_func_load (char *name, char *alias, char *sourcename,
- 		       void *vaddr, int size, int lntsize, DT_lineno *lntable)
-@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename,
- 			     vaddr, size, lntsize, lntable);
- }
- 
-void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload")));
-+void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload")));
- void
- __collector_func_unload (void *vaddr)
- {
-diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c
-index 91678b1e334..cd47d4fbe0f 100644
--- a/gprofng/libcollector/unwind.c
-+++ b/gprofng/libcollector/unwind.c
-@@ -416,7 +416,7 @@ __collector_ext_unwind_init (int record)
-   omp_no_walk = 1;
- 
-   if (__collector_VM_ReadByteInstruction == NULL)
-    __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
-+    __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
- 
- #if ARCH(SPARC)
- #if WSIZE(64)
-diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
-index ebcdbca561f..fd888cd58dd 100644
--- a/gprofng/src/collector_module.h
-+++ b/gprofng/src/collector_module.h
-@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs
-   long (*sysinfo)(int command, char *buf, long count);
-   time_t (*time)(time_t *tloc);
-   int (*unsetenv)(const char *name);
-  int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap);
-+  int (*vsnprintf)(char *str, size_t size, const char *format, ...);
-   pid_t (*waitpid)(pid_t pid, int *stat_loc, int options);
-   ssize_t (*write)(int, void *, size_t);
-   double (*atof)();
-- 
-2.50.1
-
@@ -1,199 +0,0 @@
-From e91e1fd342c9ded87f53bc7e9e8d5d693b9a570a Mon Sep 17 00:00:00 2001
-From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
-Date: Thu, 21 Nov 2024 14:48:20 -0800
-Subject: [PATCH] gprofng: fix build with -std=gnu23
-
-Fix function pointer types accordingly.
-Remove unused function pointers.
-
-gprofng/ChangeLog
-2024-11-21  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>
-
-	PR gprofng/32374
-	PR gprofng/32373
-	* common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary.
-	* libcollector/libcol_util.c (sysinfo): Remove unused pointer.
-	* src/collector_module.h: Likewise.
-	* libcollector/dispatcher.c (setitimer): Fix prototype.
-	* libcollector/linetrace.c (system, grantpt, ptsname): Likewise.
-	* testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise.
-	* testsuite/gprofng.display/synprog/endcases.c (xinline_code,
-	s_inline_code): Likewise.
-	* testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code):
-	Likewise.
-	* testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr.
-
-Upstream: 4e943705e3e8a5a9448d087502bcb390a694ad02
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- gprofng/common/cpuid.c                                 |  2 ++
- gprofng/libcollector/dispatcher.c                      |  2 +-
- gprofng/libcollector/libcol_util.c                     |  9 ---------
- gprofng/libcollector/linetrace.c                       | 10 +++++-----
- gprofng/src/collector_module.h                         |  1 -
- gprofng/testsuite/gprofng.display/mttest/mttest.c      |  2 +-
- gprofng/testsuite/gprofng.display/synprog/endcases.c   |  4 ++--
- gprofng/testsuite/gprofng.display/synprog/inc_inline.h |  2 +-
- gprofng/testsuite/gprofng.display/synprog/synprog.c    |  4 ++--
- 9 files changed, 14 insertions(+), 22 deletions(-)
-
-diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c
-index af15439eb27..0373969693b 100644
--- a/gprofng/common/cpuid.c
-+++ b/gprofng/common/cpuid.c
-@@ -21,7 +21,9 @@
- #if defined(__i386__) || defined(__x86_64)
- #include <cpuid.h>  /* GCC-provided */
- #elif defined(__aarch64__)
-+#if !defined(ATTRIBUTE_UNUSED)
- #define ATTRIBUTE_UNUSED __attribute__((unused))
-+#endif
- 
- static inline uint_t __attribute_const__
- __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax,
-diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c
-index 5ee0bf895bf..e85c343c776 100644
--- a/gprofng/libcollector/dispatcher.c
-+++ b/gprofng/libcollector/dispatcher.c
-@@ -1281,4 +1281,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags,
- // weak symbols:
- int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask")));
- int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
-int setitimer () __attribute__ ((weak, alias ("_setitimer")));
-+__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer")));
-diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
-index 688bdf19c6d..46f8b80ccb4 100644
--- a/gprofng/libcollector/libcol_util.c
-+++ b/gprofng/libcollector/libcol_util.c
-@@ -1427,15 +1427,6 @@ __collector_util_init ()
-       err = COL_ERROR_UTIL_INIT;
-     }
- 
-  ptr = dlsym (libc, "sysinfo");
-  if (ptr)
-    __collector_util_funcs.sysinfo = (long (*)())ptr;
-  else
-    {
-      CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ());
-      err = COL_ERROR_UTIL_INIT;
-    }
-
-   ptr = dlsym (libc, "clearenv");
-   if (ptr)
-     __collector_util_funcs.clearenv = (int(*)())ptr;
-diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c
-index 66844bc1337..c81ae1a2272 100644
--- a/gprofng/libcollector/linetrace.c
-+++ b/gprofng/libcollector/linetrace.c
-@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2)
- DCL_POSIX_SPAWNP (posix_spawnp)
- 
- /*------------------------------------------------------------- system */
-int system () __attribute__ ((weak, alias ("__collector_system")));
-+int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system")));
- 
- int
- __collector_system (const char *cmd)
-@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0)
- DCL_POPEN (popen)
- 
- /*------------------------------------------------------------- grantpt */
-int grantpt () __attribute__ ((weak, alias ("__collector_grantpt")));
-+int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt")));
- 
- int
-__collector_grantpt (const int fildes)
-+__collector_grantpt (int fildes)
- {
-   if (NULL_PTR (grantpt))
-     init_lineage_intf ();
-@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes)
- }
- 
- /*------------------------------------------------------------- ptsname */
-char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname")));
-+char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname")));
- 
- char *
-__collector_ptsname (const int fildes)
-+__collector_ptsname (int fildes)
- {
-   if (NULL_PTR (ptsname))
-     init_lineage_intf ();
-diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
-index fd888cd58dd..6640f12fa3c 100644
--- a/gprofng/src/collector_module.h
-+++ b/gprofng/src/collector_module.h
-@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs
-   int (*symlink)(const char *s1, const char *s2);
-   int (*syscall)(int number, ...);
-   long (*sysconf)(int name);
-  long (*sysinfo)(int command, char *buf, long count);
-   time_t (*time)(time_t *tloc);
-   int (*unsetenv)(const char *name);
-   int (*vsnprintf)(char *str, size_t size, const char *format, ...);
-diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c
-index e0835c833e5..3db5b8d8e86 100644
--- a/gprofng/testsuite/gprofng.display/mttest/mttest.c
-+++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c
-@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x);
- void computeK (workStruct_t *x);
- void addone (workCtr_t *x);
- void init_arrays (int strat);
-void dump_arrays ();
-+void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index);
- void *do_work (void *v);
- void thread_work ();
- void nothreads (Workblk *array, struct scripttab *k);
-diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c
-index a6a1389658a..6f1c83b6859 100644
--- a/gprofng/testsuite/gprofng.display/synprog/endcases.c
-+++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c
-@@ -40,8 +40,8 @@ static void s_inline_code (int);
- void ext_inline_code (int);
- 
- #ifndef NO_INLINE
-void xinline_code () __attribute__ ((always_inline));
-void s_inline_code () __attribute__ ((always_inline));
-+void xinline_code (int) __attribute__ ((always_inline));
-+void s_inline_code (int) __attribute__ ((always_inline));
- #endif
- 
- #include "inc_inline.h"
-diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
-index da42563c828..6600eacb66d 100644
--- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
-+++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
-@@ -19,7 +19,7 @@
-    MA 02110-1301, USA.  */
- 
- #ifndef NO_INLINE
-void ext_inline_code() __attribute__ ((always_inline));
-+void ext_inline_code(int) __attribute__ ((always_inline));
- #endif
- 
- void
-diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c
-index cf1bc5b0909..05920dc7419 100644
--- a/gprofng/testsuite/gprofng.display/synprog/synprog.c
-+++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c
-@@ -528,14 +528,14 @@ reapchildren ()
- int
- doabort (int k)
- {
-  char *nullptr = NULL;
-+  char *p = NULL;
-   char c;
- 
-   /* Log the event */
-   wlog ("start of doabort", NULL);
- 
-   /* and dereference a NULL */
-  c = *nullptr;
-+  c = *p;
- 
-   /* this should never be reached */
-   return (int) c;
-- 
-2.50.1
-
@@ -1,4 +1,4 @@
-From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001
+From 0bf75276c392cac7794e78e1572abcd793d99e4e Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Fri, 25 Dec 2015 11:38:13 +0100
 Subject: [PATCH] sh-conf
@@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/configure b/configure
-index 670684d83d1..967c6708a0c 100755
+index bbfb5979546..bcd95684ae1 100755
 --- a/configure
 +++ b/configure
-@@ -4042,7 +4042,7 @@ case "${target}" in
+@@ -4056,7 +4056,7 @@ case "${target}" in
   nvptx*-*-*)
     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
     ;;
@@ -33,10 +33,10 @@ index 670684d83d1..967c6708a0c 100755
       sh*-*-elf)
          ;;
 diff --git a/configure.ac b/configure.ac
-index 88b4800e298..2c8d08ff6ec 100644
+index f9694cdf901..d6a3623ba50 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1269,7 +1269,7 @@ case "${target}" in
+@@ -1278,7 +1278,7 @@ case "${target}" in
   nvptx*-*-*)
     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
     ;;
@@ -46,5 +46,5 @@ index 88b4800e298..2c8d08ff6ec 100644
       sh*-*-elf)
          ;;
 -- 
-2.43.0
+2.51.1

@@ -1,4 +1,4 @@
-From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001
+From 92f4bd0e1713577e30491e99a0226088eaeae740 Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Fri, 25 Dec 2015 11:45:38 +0100
 Subject: [PATCH] poison-system-directories
@@ -6,6 +6,8 @@ Subject: [PATCH] poison-system-directories
 Patch adapted to binutils 2.23.2 and extended to use
 BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.

+[Waldemar: rebase on top of 2.43]
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 [Waldemar: rebase on top of 2.39]
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 [Romain: rebase on top of 2.33.1]
@@ -74,17 +76,17 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 ld/configure.ac | 10 ++++++++++
 ld/ld.h         |  8 ++++++++
 ld/ld.texi      | 12 ++++++++++++
- ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldfile.c     | 16 ++++++++++++++++
 ld/ldlex.h      |  2 ++
 ld/ldmain.c     |  2 ++
 ld/lexsup.c     | 21 +++++++++++++++++++++
- 9 files changed, 89 insertions(+)
+ 9 files changed, 88 insertions(+)

 diff --git a/ld/config.in b/ld/config.in
-index 52d62f06ff0..b5944e7ba55 100644
+index 790efd336be..2b237bcda5e 100644
 --- a/ld/config.in
 +++ b/ld/config.in
-@@ -70,6 +70,9 @@
+@@ -86,6 +86,9 @@
    language is requested. */
 #undef ENABLE_NLS
 
@@ -95,27 +97,27 @@ index 52d62f06ff0..b5944e7ba55 100644
 #undef EXTRA_SHLIB_EXTENSION
 
 diff --git a/ld/configure b/ld/configure
-index ba1e5e2a215..2220d7afe2a 100755
+index cd410bd64d1..7e9913949d4 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -844,6 +844,7 @@ with_lib_path
+@@ -841,6 +841,7 @@ enable_checking
+ with_lib_path
 enable_targets
- enable_64_bit_bfd
 with_sysroot
 +enable_poison_system_directories
 enable_gold
 enable_got
 enable_compressed_debug_sections
-@@ -1534,6 +1535,8 @@ Optional Features:
+@@ -1535,6 +1536,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
   --enable-checking       enable run-time checks
   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
 +  --enable-poison-system-directories
 +                          warn for use of native system library directories
   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
   --enable-got=<type>     GOT handling scheme (target, single, negative,
                           multigot)
-@@ -15587,7 +15590,18 @@ else
+@@ -15393,7 +15396,18 @@ else
 fi
 
 
@@ -135,10 +137,10 @@ index ba1e5e2a215..2220d7afe2a 100755
 # Check whether --enable-got was given.
 if test "${enable_got+set}" = set; then :
 diff --git a/ld/configure.ac b/ld/configure.ac
-index 4a11787ae71..104a531fb0f 100644
+index f528ae42ef7..dcf1e17fae6 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot)
+@@ -115,6 +115,16 @@ AC_SUBST(use_sysroot)
 AC_SUBST(TARGET_SYSTEM_ROOT)
 AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
 
@@ -156,7 +158,7 @@ index 4a11787ae71..104a531fb0f 100644
 dnl "install_as_default" is set to false if gold is the default linker.
 dnl "installed_linker" is the installed BFD linker name.
 diff --git a/ld/ld.h b/ld/ld.h
-index 54d9079678c..9f0163b2911 100644
+index c8688153bd4..0b16caf347a 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
@@ -166,6 +166,14 @@ typedef struct
@@ -175,10 +177,10 @@ index 54d9079678c..9f0163b2911 100644
   enum endian_enum endian;
 
 diff --git a/ld/ld.texi b/ld/ld.texi
-index 4fda259a552..11fd8f7547b 100644
+index cf750d15259..1acaa26f107 100644
 --- a/ld/ld.texi
 +++ b/ld/ld.texi
-@@ -3108,6 +3108,18 @@ string identifying the original linked file does not change.
+@@ -3362,6 +3362,18 @@ bit string identifying the original linked file does not change.
 Passing @code{none} for @var{style} disables the setting from any
 @code{--build-id} options earlier on the command line.
 
@@ -198,10 +200,10 @@ index 4fda259a552..11fd8f7547b 100644
 @item --package-metadata=@var{JSON}
 Request the creation of a @code{.note.package} ELF note section.  The
 diff --git a/ld/ldfile.c b/ld/ldfile.c
-index dc9875d8813..49d899ee49d 100644
+index 75fd360d5e3..3526ea8146c 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline)
+@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *name, bool cmdline)
     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
   else
     new_dirs->name = xstrdup (name);
@@ -221,15 +223,14 @@ index dc9875d8813..49d899ee49d 100644
 +            "cross-compilation\n"), name);
 +   }
 +#endif
-+
 }
 
- /* Try to open a BFD for a lang_input_statement.  */
+ static void
 diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 161a9d4d8dc..4ca50b9c299 100644
+index c8d61478c60..4b175dca108 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -168,6 +168,8 @@ enum option_values
+@@ -172,6 +172,8 @@ enum option_values
   OPTION_CTF_VARIABLES,
   OPTION_NO_CTF_VARIABLES,
   OPTION_CTF_SHARE_TYPES,
@@ -239,10 +240,10 @@ index 161a9d4d8dc..4ca50b9c299 100644
   OPTION_NO_ERROR_EXECSTACK,
   OPTION_WARN_EXECSTACK_OBJECTS,
 diff --git a/ld/ldmain.c b/ld/ldmain.c
-index e90c2021b33..43fe888eba8 100644
+index 67c60c3f80d..c2365e4006c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -325,6 +325,8 @@ main (int argc, char **argv)
+@@ -671,6 +671,8 @@ main (int argc, char **argv)
   command_line.warn_mismatch = true;
   command_line.warn_search_mismatch = true;
   command_line.check_section_addresses = -1;
@@ -252,10 +253,10 @@ index e90c2021b33..43fe888eba8 100644
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
 diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 099dff8ecde..01626712c77 100644
+index bde20465835..422866f4ea9 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -642,6 +642,14 @@ static const struct ld_option ld_options[] =
+@@ -652,6 +652,14 @@ static const struct ld_option ld_options[] =
 		   "                                <method> is: share-unconflicted (default),\n"
 		   "                                             share-duplicated"),
     TWO_DASHES },
@@ -270,7 +271,7 @@ index 099dff8ecde..01626712c77 100644
 };
 
 #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -654,6 +662,7 @@ parse_args (unsigned argc, char **argv)
+@@ -664,6 +672,7 @@ parse_args (unsigned argc, char **argv)
   int ingroup = 0;
   char *default_dirlist = NULL;
   char *shortopts;
@@ -278,7 +279,7 @@ index 099dff8ecde..01626712c77 100644
   struct option *longopts;
   struct option *really_longopts;
   int last_optind;
-@@ -1769,6 +1778,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1800,6 +1809,14 @@ parse_args (unsigned argc, char **argv)
 	  }
 	  break;
 
@@ -293,7 +294,7 @@ index 099dff8ecde..01626712c77 100644
 	case OPTION_PUSH_STATE:
 	  input_flags.pushed = xmemdup (&input_flags,
 					sizeof (input_flags),
-@@ -1922,6 +1939,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1944,6 +1961,10 @@ parse_args (unsigned argc, char **argv)
       command_line.soname = NULL;
     }
 
@@ -305,5 +306,5 @@ index 099dff8ecde..01626712c77 100644
     {
       einfo (_("%P: missing --end-group; added as last command line option\n"));
 -- 
-2.43.0
+2.51.1

@@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI

 choice
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_43_X if !BR2_arc
+	default BR2_BINUTILS_VERSION_2_44_X if !BR2_arc
 	default BR2_BINUTILS_VERSION_ARC if BR2_arc
 	help
 	  Select the version of binutils you wish to use.
@@ -16,23 +16,23 @@ config BR2_BINUTILS_VERSION_ARC
 	bool "binutils arc (2.43)"
 	depends on BR2_arc

-config BR2_BINUTILS_VERSION_2_42_X
-	bool "binutils 2.42"
-
 config BR2_BINUTILS_VERSION_2_43_X
 	bool "binutils 2.43.1"

 config BR2_BINUTILS_VERSION_2_44_X
 	bool "binutils 2.44"

+config BR2_BINUTILS_VERSION_2_45_X
+	bool "binutils 2.45.1"
+
 endchoice

 config BR2_BINUTILS_VERSION
 	string
 	default "arc-2024.12-release"	if BR2_BINUTILS_VERSION_ARC
-	default "2.42"		if BR2_BINUTILS_VERSION_2_42_X
 	default "2.43.1"	if BR2_BINUTILS_VERSION_2_43_X
 	default "2.44"		if BR2_BINUTILS_VERSION_2_44_X
+	default "2.45.1"	if BR2_BINUTILS_VERSION_2_45_X

 config BR2_BINUTILS_GPROFNG
 	bool "gprofng support"
@@ -1,7 +1,7 @@
 # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum
-sha512  155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6  binutils-2.42.tar.xz
 sha512  20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824  binutils-2.43.1.tar.xz
 sha512  b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7  binutils-2.44.tar.xz
+sha512  ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e  binutils-2.45.1.tar.xz

 # Locally calculated (fetched from Github)
 sha512  46c336a16bde7b73dc4ceac0986887d47d542a1452e1936ef871b5e76afdb6cad4b18ccb4d93341358e7bb92c2ef74781e1fb72935d527d15251ac9f9daa8305  binutils-gdb-arc-2024.12-release.tar.gz
@@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
 BINUTILS_VERSION = arc-2024.12-release
 else
-BINUTILS_VERSION = 2.43.1
+BINUTILS_VERSION = 2.44
 endif
 endif # BINUTILS_VERSION

@@ -1,72 +0,0 @@
-From e7e341b7ba6fa9fb875718e8740b03c2041278e8 Mon Sep 17 00:00:00 2001
-From: Neal Frager <neal.frager@amd.com>
-Date: Mon, 2 Jun 2025 12:09:13 +0100
-Subject: [PATCH] bisonflex: Fix build on machines with modern flex
-
-With bootgen 2025.1, the directory structure was re-done.  In the process of
-doing this, the source files in the bisonflex directory lost the fix below
-which had been applied on an earlier version of bootgen:
-
-Bootgen embeds an old version of flex, but uses the system include syntax
-(#include <>) to reference it, causing conflicts on systems with the
-development headers for a modern flex version installed, leading to build
-issues like:
-
-../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()':
-../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream'} and 'std::istream*' {aka 'std::basic_istream*'})
-
-Fix it by using normal local #include statements by:
-
-sed -i 's/<FlexLexer.h>/"../win_include/FlexLexer.h"/g' *
-
-Upstream: submitted to AMD internal jira process
-
-Signed-off-by: Neal Frager <neal.frager@amd.com>
---
- bisonflex/bif.yy.cpp        | 2 +-
- bisonflex/cmdoptions.yy.cpp | 2 +-
- bisonflex/reginit.yy.cpp    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bisonflex/bif.yy.cpp b/bisonflex/bif.yy.cpp
-index 8d4d364..35f0aa5 100755
--- a/bisonflex/bif.yy.cpp
-+++ b/bisonflex/bif.yy.cpp
-@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
- 
- #define yytext_ptr yytext
- 
-#include <FlexLexer.h>
-+#include "../win_include/FlexLexer.h"
- 
- int yyFlexLexer::yywrap() { return 1; }
- int yyFlexLexer::yylex()
-diff --git a/bisonflex/cmdoptions.yy.cpp b/bisonflex/cmdoptions.yy.cpp
-index 661d7f3..a76ac81 100755
--- a/bisonflex/cmdoptions.yy.cpp
-+++ b/bisonflex/cmdoptions.yy.cpp
-@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
- 
- #define yytext_ptr yytext
- 
-#include <FlexLexer.h>
-+#include "../win_include/FlexLexer.h"
- 
- int yyFlexLexer::yywrap() { return 1; }
- int yyFlexLexer::yylex()
-diff --git a/bisonflex/reginit.yy.cpp b/bisonflex/reginit.yy.cpp
-index d830734..dede473 100755
--- a/bisonflex/reginit.yy.cpp
-+++ b/bisonflex/reginit.yy.cpp
-@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
- 
- #define yytext_ptr yytext
- 
-#include <FlexLexer.h>
-+#include "../win_include/FlexLexer.h"
- 
- int yyFlexLexer::yywrap() { return 1; }
- int yyFlexLexer::yylex()
-- 
-2.25.1
-
@@ -0,0 +1,51 @@
+From 1675ec9d76b32400f612b1c542be6dbf77dea986 Mon Sep 17 00:00:00 2001
+From: Neal Frager <neal.frager@amd.com>
+Date: Tue, 25 Nov 2025 12:54:48 +0000
+Subject: [PATCH] lms-hash-sigs/hss_param.c: add stdio.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The lms-hash-sigs/hss_param.c is missing an include of stdio.h. Without it,
+the following build error can occur:
+
+hss_param.c: In function ‘hss_get_parameter_set’:
+hss_param.c:157:13: error: implicit declaration of function ‘printf’ [-Wimplicit-function-declaration]
+  157 |             printf("Private key expired\n");
+      |             ^~~~~~
+hss_param.c:7:1: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’
+    6 | #include "lm_common.h"
+  +++ |+#include <stdio.h>
+    7 |
+hss_param.c:157:13: warning: incompatible implicit declaration of built-in function ‘printf’ [-Wbuiltin-declaration-mismatch]
+  157 |             printf("Private key expired\n");
+      |             ^~~~~~
+hss_param.c:157:13: note: include ‘<stdio.h>’ or provide a declaration of ‘printf’
+make[3]: *** [Makefile:38: hss_param.o] Error 1
+make[3]: *** Waiting for unfinished jobs....
+make[2]: *** [Makefile:84: build/bin/bootgen] Error 2
+
+The above error was reported on Debian 13 / gcc 14.2.0.
+
+Reported-by: Peter Korsgaard <peter@korsgaard.com>
+Signed-off-by: Neal Frager <neal.frager@amd.com>
+Upstream: submitted to Xilinx bootgen repo with CR-1256741
+---
+ lms-hash-sigs/hss_param.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lms-hash-sigs/hss_param.c b/lms-hash-sigs/hss_param.c
+index 7a2abd6..6b2b950 100755
+--- a/lms-hash-sigs/hss_param.c
+++ b/lms-hash-sigs/hss_param.c
+@@ -4,6 +4,7 @@
+ #include "endian.h"
+ #include "hss_zeroize.h"
+ #include "lm_common.h"
+#include <stdio.h>
+ 
+ static struct map_structure {
+     param_set_t public;
+-- 
+2.25.1
+
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  3de43a331e10b2a8079d4681ad72cef4884bc3a09250d3d80811d677f3ffe560  bootgen-xilinx_v2025.1.tar.gz
+sha256  c92d9be48fabc943c4addd9b12beced6671f5547b4f6dc01e7ccf0f274dbef66  bootgen-xilinx_v2025.2.tar.gz
 sha256  36e278ff2cc9ef95154a923bf4a9450414f358779045ae4f863c8d77fb18dbdb  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-BOOTGEN_VERSION = xilinx_v2025.1
+BOOTGEN_VERSION = xilinx_v2025.2
 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION))
 HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf
 BOOTGEN_LICENSE = Apache-2.0
@@ -0,0 +1,22 @@
+From d1a4256b3a019117f2bb6cb8c63d6367aaf512e2 Mon Sep 17 00:00:00 2001
+From: Erwin Coumans <erwincoumans@gmail.com>
+Date: Wed, 23 Apr 2025 14:17:20 -0700
+Subject: [PATCH] update CMake required version
+
+Upstream: https://github.com/bulletphysics/bullet3/commit/d1a4256b3a019117f2bb6cb8c63d6367aaf512e2
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a695b71726..e7a58e6d67 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.4.3)
+cmake_minimum_required(VERSION 3.5)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+ cmake_policy(SET CMP0017 NEW)
+ #this line has to appear before 'PROJECT' in order to be able to disable incremental linking
@@ -1,4 +1,4 @@
 # sha256 computed locally
-sha256  42e6c4b260cffd92dfa755e26390f45f5842e8c1a5f64f2b2e68adfbe82d1542  ccache-4.12.1.tar.xz
+sha256  96ad53c76ecdb9c7a78e28a9bfdf2c95d7eece28546510fde7e16e5a13e2f7f8  ccache-4.12.2.tar.xz
 sha256  80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5  GPL-3.0.txt
 sha256  fc33d985529cdb5ea484ee46d6df4de6a6bca25ebdd3f3211c9d15f1c59dc75a  LICENSE.adoc
@@ -4,7 +4,7 @@
 #
 ################################################################################

-CCACHE_VERSION = 4.12.1
+CCACHE_VERSION = 4.12.2
 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION)
 CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
 CCACHE_LICENSE = GPL-3.0+, others
@@ -63,10 +63,25 @@ config BR2_HOST_CMAKE_AT_LEAST_3_31
 	bool
 	select BR2_HOST_CMAKE_AT_LEAST_3_30

+config BR2_HOST_CMAKE_AT_LEAST_4_0
+	bool
+	select BR2_HOST_CMAKE_AT_LEAST_3_31
+
+config BR2_HOST_CMAKE_AT_LEAST_4_1
+	bool
+	select BR2_HOST_CMAKE_AT_LEAST_4_0
+
+config BR2_HOST_CMAKE_AT_LEAST_4_2
+	bool
+	select BR2_HOST_CMAKE_AT_LEAST_4_1
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_HOST_CMAKE_AT_LEAST
 	string
+	default "4.2"	if BR2_HOST_CMAKE_AT_LEAST_4_2
+	default "4.1"	if BR2_HOST_CMAKE_AT_LEAST_4_1
+	default "4.0"	if BR2_HOST_CMAKE_AT_LEAST_4_0
 	default "3.31"	if BR2_HOST_CMAKE_AT_LEAST_3_31
 	default "3.30"	if BR2_HOST_CMAKE_AT_LEAST_3_30
 	default "3.29"	if BR2_HOST_CMAKE_AT_LEAST_3_29
@@ -1,5 +1,5 @@
-# From https://cmake.org/files/v3.31/cmake-3.31.9-SHA-256.txt
-sha256  5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83  cmake-3.31.9.tar.gz
+# From https://cmake.org/files/v4.2/cmake-4.2.0-SHA-256.txt
+sha256  4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579  cmake-4.2.0.tar.gz

 # Locally calculated
-sha256  0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8  Copyright.txt
+sha256  1e0d48f16c60f400838a96989684ae12cec35cb96688db11e8cb0204058cf4b8  LICENSE.rst
@@ -5,11 +5,11 @@
 ################################################################################

 # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y
-CMAKE_VERSION_MAJOR = 3.31
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9
+CMAKE_VERSION_MAJOR = 4.2
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
-CMAKE_LICENSE_FILES = Copyright.txt
+CMAKE_LICENSE_FILES = LICENSE.rst
 CMAKE_CPE_ID_VALID = YES
 # Tool download MITM attack warning if using npm package to install cmake
 CMAKE_IGNORE_CVES = CVE-2016-10642
@@ -476,6 +476,7 @@ config BR2_PACKAGE_COLLECTD_PING
 config BR2_PACKAGE_COLLECTD_POSTGRESQL
 	bool "postgresql"
 	depends on BR2_USE_MMU # postgresql
+	depends on !BR2_sparc # postgresql
 	depends on BR2_USE_WCHAR # postgresql
 	depends on BR2_ENABLE_LOCALE # postgresql
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # postgresql
@@ -489,6 +490,7 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
 	  collectd 'value lists'.

 comment "postgresql support needs a toolchain w/ wchar"
+	depends on !BR2_sparc
 	depends on !BR2_USE_WCHAR

 comment "postgresql support can't be built with Optimize for fast"
@@ -1,31 +0,0 @@
-From c347aeb43775109cbc2824b99cb10b1b3440c191 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 17 May 2021 21:27:11 +0200
-Subject: [PATCH] server/CMakeLists.txt: don't override CMAKE_EXE_LINKER_FLAGS
-
-Don't override CMAKE_EXE_LINKER_FLAGS as this could break the build if
-CMAKE_EXE_LINKER_FLAGS is already set by the user (for example to pass
-latomic)
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/cutelyst/cutelyst/pull/312]
---
- wsgi/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index ec5689f7..1ed56859 100644
--- a/wsgi/CMakeLists.txt
-+++ b/wsgi/CMakeLists.txt
-@@ -95,7 +95,7 @@ install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server
-     cxx_generalized_initializers
- )
- if (JEMALLOC_FOUND)
-    set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " -Wl,--no-as-needed")
-+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed")
-     target_link_libraries(cutelyst-wsgi2 PRIVATE ${JEMALLOC_LIBRARIES})
- endif()
- 
-- 
-2.30.2
-
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256  b0e3d658a60d68906f7255b78bad64af1aa07cb3b785fbf61629b7355f089baa  cutelyst-2.11.0.tar.gz
-sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
+sha256  351578d495213c438365f988a70bb8f8c14b1d7dcef79ce0f723dd584388aa77  cutelyst-3.5.0.tar.gz
+sha256  ca0c629be86a1691ec413a3f9137a1aa62663d5ec30c5867cf4b283f18eb0bd7  COPYING
--- a/Show More
+++ b/Show More