[Buildroot] [PATCH v1 1/5] board/xilinx: add xilinx_v2025.1 support

[Buildroot] [PATCH v1 1/5] board/xilinx: add xilinx_v2025.1 support

[Neal Frager via buildroot]

Add hashes for xilinx_v2025.1 release.

xilinx_v2025.1 release includes:
 - atf 2.12
 - linux 6.12.10
 - uboot 2025.01

In addition, the xilinx_v2025.1 linux kernel release tag has a Kconfig leak
of the CONFIG_XILINX_AIE option.  This patch adds a patch that is specific to
the Xilinx Linux 6.12.10 release which fixes the problem by moving the changes
implemented by the CONFIG_XILINX_AIE option from the exposed uapi header file
to the Linux internal header file.

The patch has been added to the board/xilinx/linux_6.12/patches directory, so
that it will only be applied when a user specifies they wish to build the
xilinx_v2025.1 release or they use a defconfig that has migrated to this
release.

Since the header file that causes the issue is not yet mainline, this patch
has been "upstreamed" to the Xilinx linux-xlnx repo via the AMD internal jira
process.

Upstream: internal AMD jira process

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 ...ux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch | 126 ++++++++++++++++++
 .../arm-trusted-firmware.hash                 |   1 +
 board/xilinx/patches/linux/linux.hash         |   1 +
 board/xilinx/patches/uboot/uboot.hash         |   1 +
 4 files changed, 129 insertions(+)
 create mode 100644 board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch

diff --git a/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch
new file mode 100644
index 0000000000..59974410bc
--- /dev/null
+++ b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch
@@ -0,0 +1,126 @@
+From 333678d7b9edc29e8148411d48f70950b1b614c1 Mon Sep 17 00:00:00 2001
+From: Neal Frager <neal.frager@amd.com>
+Date: Mon, 2 Jun 2025 11:07:03 +0100
+Subject: [PATCH 1/1] include/uapi/linux/xlnx-ai-engine.h: fix
+ CONFIG_XILINX_AIE leak
+
+Linux Kconfig options should not be exposed to user space.  This patch fixes
+a Linux kernel leak of the CONFIG_XILINX_AIE option by moving the changes
+implemented by the CONFIG_XILINX_AIE from the uapi header file to the local
+Linux kernel header file.
+
+Signed-off-by: Neal Frager <neal.frager@amd.com>
+---
+ include/linux/xlnx-ai-engine.h      | 37 +++++++++++++++++++++++++
+ include/uapi/linux/xlnx-ai-engine.h | 42 -----------------------------
+ 2 files changed, 37 insertions(+), 42 deletions(-)
+
+diff --git a/include/linux/xlnx-ai-engine.h b/include/linux/xlnx-ai-engine.h
+index 44a1e40ef9b8..10905dc84ae9 100644
+--- a/include/linux/xlnx-ai-engine.h
++++ b/include/linux/xlnx-ai-engine.h
+@@ -171,6 +171,13 @@ static inline u32 aie_get_error_category(struct aie_error *err)
+ 	return err->category;
+ }
+ 
++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc);
++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc);
++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval);
++int aie_load_cert(struct device *dev, unsigned char *elf_addr);
++
+ #else
+ static inline bool aie_partition_is_available(struct aie_partition_req *req)
+ {
+@@ -271,5 +278,35 @@ static inline int aie_part_rscmgr_set_static_range(struct device *dev,
+ 	return -EINVAL;
+ }
+ 
++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
++{
++	return -EINVAL;
++}
++
++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
++{
++	return -EINVAL;
++}
++
++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc)
++{
++	return false;
++}
++
++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc)
++{
++	return 0;
++}
++
++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval)
++{
++	return -EINVAL;
++}
++
++int aie_load_cert(struct device *dev, unsigned char *elf_addr)
++{
++	return -EINVAL;
++}
++
+ #endif /* CONFIG_XILINX_AIE */
+ #endif
+diff --git a/include/uapi/linux/xlnx-ai-engine.h b/include/uapi/linux/xlnx-ai-engine.h
+index 424c5f4c4097..1680aed8ad85 100644
+--- a/include/uapi/linux/xlnx-ai-engine.h
++++ b/include/uapi/linux/xlnx-ai-engine.h
+@@ -781,47 +781,5 @@ struct aie_rsc_user_stat_array {
+  */
+ #define AIE_UPDATE_SHIMDMA_DMABUF_BD_ADDR_IOCTL	_IOW(AIE_IOCTL_BASE, 0x1e, \
+ 						struct aie_dmabuf_bd_args)
+-#if IS_ENABLED(CONFIG_XILINX_AIE)
+-
+-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
+-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
+-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc);
+-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc);
+-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval);
+-int aie_load_cert(struct device *dev, unsigned char *elf_addr);
+-
+-#else /* IS_ENABLED(CONFIG_XILINX_AIE) */
+-
+-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
+-{
+-	return -EINVAL;
+-}
+-
+-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
+-{
+-	return -EINVAL;
+-}
+-
+-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc)
+-{
+-	return false;
+-}
+-
+-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc)
+-{
+-	return 0;
+-}
+-
+-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval)
+-{
+-	return -EINVAL;
+-}
+-
+-int aie_load_cert(struct device *dev, unsigned char *elf_addr)
+-{
+-	return -EINVAL;
+-}
+-
+-#endif /* IS_ENABLED(CONFIG_XILINX_AIE) */
+ 
+ #endif
+-- 
+2.25.1
+
diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
index 15cceebb80..2ef3825bb9 100644
--- a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256  a45390c9e1d584a389abd37ee49dce3f8d3b41718b1fd7c977608b5387a38955  xlnx_rebase_v2.10_2024.2.tar.gz
+sha256  4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d  xlnx_rebase_v2.12_2025.1.tar.gz
diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash
index a970a878c2..0022390aa6 100644
--- a/board/xilinx/patches/linux/linux.hash
+++ b/board/xilinx/patches/linux/linux.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256  b726226e8784d92049190f19768d393eccf3ad111c7a2e685bb29cfa1bdf1f70  xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz
+sha256  25795c354f30a3358506ab02deeac99e7f79850804c52d6c3d5539fd310f0491  xlnx_rebase_v6.12_LTS_2025.1.tar.gz
diff --git a/board/xilinx/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash
index de0e6adad1..56ee166378 100644
--- a/board/xilinx/patches/uboot/uboot.hash
+++ b/board/xilinx/patches/uboot/uboot.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256  f1a86ccdbe60bac89177a24bbfd56fc6e8e67823669f0997de563c3cc0ea4dd1  xlnx_rebase_v2024.01_2024.2.tar.gz
+sha256  b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93  xlnx_rebase_v2025.01_2025.1.tar.gz
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 2/5] configs/zynq_zc702_defconfig: bump to xilinx-v2025.1

[Neal Frager via buildroot]

This patch bumps the zynq_zc702_defconfig to xilinx-v2025.1 which includes
the following updates:

- Linux v6.12.10
- U-Boot v2025.01

The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 configs/zynq_zc702_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 4c6361a9b7..ac3304f293 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
-BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -22,7 +22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz"
+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_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 3/5] configs/zynq_zc706_defconfig: bump to xilinx-v2025.1

[Neal Frager via buildroot]

This patch bumps the zynq_zc706_defconfig to xilinx-v2025.1 which includes
the following updates:

- Linux v6.12.10
- U-Boot v2025.01

The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 configs/zynq_zc706_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index bc853f522d..600b521fac 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
-BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -22,7 +22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz"
+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_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 4/5] configs/zynq_microzed_defconfig: bump to xilinx-v2025.1

[Neal Frager via buildroot]

This patch bumps the zynq_microzed_defconfig to xilinx-v2025.1 which includes
the following updates:

- Linux v6.12.10
- U-Boot v2025.01

The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 configs/zynq_microzed_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index f9be297b99..404e09b7be 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
-BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -22,7 +22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz"
+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_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 5/5] configs/zynq_zed_defconfig: bump to xilinx-v2025.1

[Neal Frager via buildroot]

This patch bumps the zynq_microzed_defconfig to xilinx-v2025.1 which includes
the following updates:

- Linux v6.12.10
- U-Boot v2025.01

The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 configs/zynq_zed_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index d0fbaf2ea5..ea15865535 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -2,14 +2,14 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
-BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches board/xilinx/linux_6.12/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 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.6_LTS_merge_6.6.70)/xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_2025.1)/xlnx_rebase_v6.12_LTS_2025.1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -22,7 +22,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_v2024.01_2024.2)/xlnx_rebase_v2024.01_2024.2.tar.gz"
+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_BOARD_DEFCONFIG="xilinx_zynq_virt"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/5] board/xilinx: add xilinx_v2025.1 support

[Luca Ceresoli via buildroot]

On Mon, 2 Jun 2025 14:50:52 +0100
Neal Frager <neal.frager@amd.com> wrote:

> Add hashes for xilinx_v2025.1 release.
> 
> xilinx_v2025.1 release includes:
>  - atf 2.12
>  - linux 6.12.10
>  - uboot 2025.01
> 
> In addition, the xilinx_v2025.1 linux kernel release tag has a Kconfig leak
> of the CONFIG_XILINX_AIE option.  This patch adds a patch that is specific to
> the Xilinx Linux 6.12.10 release which fixes the problem by moving the changes
> implemented by the CONFIG_XILINX_AIE option from the exposed uapi header file
> to the Linux internal header file.
> 
> The patch has been added to the board/xilinx/linux_6.12/patches directory, so
> that it will only be applied when a user specifies they wish to build the
> xilinx_v2025.1 release or they use a defconfig that has migrated to this
> release.
> 
> Since the header file that causes the issue is not yet mainline, this patch
> has been "upstreamed" to the Xilinx linux-xlnx repo via the AMD internal jira
> process.
> 
> Upstream: internal AMD jira process
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/5] configs/zynq_zc702_defconfig: bump to xilinx-v2025.1

[Luca Ceresoli via buildroot]

On Mon, 2 Jun 2025 14:50:53 +0100
Neal Frager <neal.frager@amd.com> wrote:

> From: Neal Frager <neal.frager@amd.com>
> To: <buildroot@buildroot.org>
> CC: <arnout@rnout.be>, <luca.ceresoli@bootlin.com>, <thomas.petazzoni@bootlin.com>, <peter@korsgaard.com>, <michal.simek@amd.com>, <ju.o@free.fr>, <brandon.maier@collins.com>, <romain.naour@smile.fr>, <ibai.erkiaga-elorza@amd.com>, Neal Frager <neal.frager@amd.com>
> Subject: [PATCH v1 2/5] configs/zynq_zc702_defconfig: bump to xilinx-v2025.1
> Date: Mon, 2 Jun 2025 14:50:53 +0100
> X-Mailer: git-send-email 2.25.1
> 
> This patch bumps the zynq_zc702_defconfig to xilinx-v2025.1 which includes
> the following updates:
> 
> - Linux v6.12.10
> - U-Boot v2025.01
> 
> The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
> leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 3/5] configs/zynq_zc706_defconfig: bump to xilinx-v2025.1

[Luca Ceresoli via buildroot]

On Mon, 2 Jun 2025 14:50:54 +0100
Neal Frager <neal.frager@amd.com> wrote:

> Subject: [PATCH v1 3/5] configs/zynq_zc706_defconfig: bump to xilinx-v2025.1
> Date: Mon, 2 Jun 2025 14:50:54 +0100
> X-Mailer: git-send-email 2.25.1
> 
> This patch bumps the zynq_zc706_defconfig to xilinx-v2025.1 which includes
> the following updates:
> 
> - Linux v6.12.10
> - U-Boot v2025.01
> 
> The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
> leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 4/5] configs/zynq_microzed_defconfig: bump to xilinx-v2025.1

[Luca Ceresoli via buildroot]

On Mon, 2 Jun 2025 14:50:55 +0100
Neal Frager <neal.frager@amd.com> wrote:

> This patch bumps the zynq_microzed_defconfig to xilinx-v2025.1 which includes
> the following updates:
> 
> - Linux v6.12.10
> - U-Boot v2025.01
> 
> The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
> leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 5/5] configs/zynq_zed_defconfig: bump to xilinx-v2025.1

[Luca Ceresoli via buildroot]

On Mon, 2 Jun 2025 14:50:56 +0100
Neal Frager <neal.frager@amd.com> wrote:

> This patch bumps the zynq_microzed_defconfig to xilinx-v2025.1 which includes
> the following updates:
> 
> - Linux v6.12.10
> - U-Boot v2025.01
> 
> The xilinx-v2025.1 Linux 6.12.10 release tag requires a patch to fix a
> leak of the Kconfig CONFIG_XILINX_AIE, so this patch is now included.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/5] board/xilinx: add xilinx_v2025.1 support

[Frager, Neal via buildroot]

[AMD Official Use Only - AMD Internal Distribution Only]

> Add hashes for xilinx_v2025.1 release.
>
> xilinx_v2025.1 release includes:
>  - atf 2.12
>  - linux 6.12.10
>  - uboot 2025.01
>
> In addition, the xilinx_v2025.1 linux kernel release tag has a Kconfig leak
> of the CONFIG_XILINX_AIE option.  This patch adds a patch that is specific to
> the Xilinx Linux 6.12.10 release which fixes the problem by moving the changes
> implemented by the CONFIG_XILINX_AIE option from the exposed uapi header file
> to the Linux internal header file.
>
> The patch has been added to the board/xilinx/linux_6.12/patches directory, so
> that it will only be applied when a user specifies they wish to build the
> xilinx_v2025.1 release or they use a defconfig that has migrated to this
> release.
>
> Since the header file that causes the issue is not yet mainline, this patch
> has been "upstreamed" to the Xilinx linux-xlnx repo via the AMD internal jira
> process.
>
> Upstream: internal AMD jira process
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>

> I built the zcu106 using the AIE patch to verify it fixes the linux
> headers issue. Thank you Neal!

> Tested-by: Brandon Maier <brandon.maier@collins.com>

Hi Brandon,

Thank you for reviewing this patch set!

My patch was committed to our internal repo with the commit link below:
https://gitenterprise.xilinx.com/Linux/linux-xlnx/commit/9691533f6e6fd0a596ac7688e82eeea53f22c434

For now, you will need to trust me that this is the case since it is not yet
published on our public GitHub.

In any case, when I bump the defconfigs to Linux 6.12.30 or Linux 6.12.40, I
will be able to remove the patch from Buildroot since it is already applied
"upstream".

Best regards,
Neal Frager
AMD

> ---
>  ...ux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch | 126 ++++++++++++++++++
>  .../arm-trusted-firmware.hash                 |   1 +
>  board/xilinx/patches/linux/linux.hash         |   1 +
>  board/xilinx/patches/uboot/uboot.hash         |   1 +
>  4 files changed, 129 insertions(+)
>  create mode 100644 board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch
>
> diff --git a/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch
> new file mode 100644
> index 0000000000..59974410bc
> --- /dev/null
> +++ b/board/xilinx/linux_6.12/patches/linux/0001-include-uapi-linux-xlnx-ai-engine.h-fix-CONFIG_XILIN.patch
> @@ -0,0 +1,126 @@
> +From 333678d7b9edc29e8148411d48f70950b1b614c1 Mon Sep 17 00:00:00 2001
> +From: Neal Frager <neal.frager@amd.com>
> +Date: Mon, 2 Jun 2025 11:07:03 +0100
> +Subject: [PATCH 1/1] include/uapi/linux/xlnx-ai-engine.h: fix
> + CONFIG_XILINX_AIE leak
> +
> +Linux Kconfig options should not be exposed to user space.  This patch fixes
> +a Linux kernel leak of the CONFIG_XILINX_AIE option by moving the changes
> +implemented by the CONFIG_XILINX_AIE from the uapi header file to the local
> +Linux kernel header file.
> +
> +Signed-off-by: Neal Frager <neal.frager@amd.com>
> +---
> + include/linux/xlnx-ai-engine.h      | 37 +++++++++++++++++++++++++
> + include/uapi/linux/xlnx-ai-engine.h | 42 -----------------------------
> + 2 files changed, 37 insertions(+), 42 deletions(-)
> +
> +diff --git a/include/linux/xlnx-ai-engine.h b/include/linux/xlnx-ai-engine.h
> +index 44a1e40ef9b8..10905dc84ae9 100644
> +--- a/include/linux/xlnx-ai-engine.h
> ++++ b/include/linux/xlnx-ai-engine.h
> +@@ -171,6 +171,13 @@ static inline u32 aie_get_error_category(struct aie_error *err)
> +     return err->category;
> + }
> +
> ++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
> ++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
> ++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc);
> ++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc);
> ++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval);
> ++int aie_load_cert(struct device *dev, unsigned char *elf_addr);
> ++
> + #else
> + static inline bool aie_partition_is_available(struct aie_partition_req *req)
> + {
> +@@ -271,5 +278,35 @@ static inline int aie_part_rscmgr_set_static_range(struct device *dev,
> +     return -EINVAL;
> + }
> +
> ++int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
> ++{
> ++    return -EINVAL;
> ++}
> ++
> ++int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
> ++{
> ++    return -EINVAL;
> ++}
> ++
> ++bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc)
> ++{
> ++    return false;
> ++}
> ++
> ++int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc)
> ++{
> ++    return 0;
> ++}
> ++
> ++int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval)
> ++{
> ++    return -EINVAL;
> ++}
> ++
> ++int aie_load_cert(struct device *dev, unsigned char *elf_addr)
> ++{
> ++    return -EINVAL;
> ++}
> ++
> + #endif /* CONFIG_XILINX_AIE */
> + #endif
> +diff --git a/include/uapi/linux/xlnx-ai-engine.h b/include/uapi/linux/xlnx-ai-engine.h
> +index 424c5f4c4097..1680aed8ad85 100644
> +--- a/include/uapi/linux/xlnx-ai-engine.h
> ++++ b/include/uapi/linux/xlnx-ai-engine.h
> +@@ -781,47 +781,5 @@ struct aie_rsc_user_stat_array {
> +  */
> + #define AIE_UPDATE_SHIMDMA_DMABUF_BD_ADDR_IOCTL     _IOW(AIE_IOCTL_BASE, 0x1e, \
> +                                             struct aie_dmabuf_bd_args)
> +-#if IS_ENABLED(CONFIG_XILINX_AIE)
> +-
> +-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
> +-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data);
> +-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc);
> +-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc);
> +-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval);
> +-int aie_load_cert(struct device *dev, unsigned char *elf_addr);
> +-
> +-#else /* IS_ENABLED(CONFIG_XILINX_AIE) */
> +-
> +-int aie_partition_write_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
> +-{
> +-    return -EINVAL;
> +-}
> +-
> +-int aie_partition_read_privileged_mem(struct device *dev, size_t offset, size_t len, void *data)
> +-{
> +-    return -EINVAL;
> +-}
> +-
> +-bool aie_partition_check_noc_aximm(struct device *dev, struct aie_location *loc)
> +-{
> +-    return false;
> +-}
> +-
> +-int aie_partition_check_uc_aximm(struct device *dev, struct aie_location *loc)
> +-{
> +-    return 0;
> +-}
> +-
> +-int aie_partition_uc_zeroize_mem(struct device *dev, struct aie_location *loc, u32 regval)
> +-{
> +-    return -EINVAL;
> +-}
> +-
> +-int aie_load_cert(struct device *dev, unsigned char *elf_addr)
> +-{
> +-    return -EINVAL;
> +-}
> +-
> +-#endif /* IS_ENABLED(CONFIG_XILINX_AIE) */
> +
> + #endif
> +--
> +2.25.1
> +
> diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> index 15cceebb80..2ef3825bb9 100644
> --- a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> +++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> @@ -1,2 +1,3 @@
>  # Locally calculated
>  sha256  a45390c9e1d584a389abd37ee49dce3f8d3b41718b1fd7c977608b5387a38955  xlnx_rebase_v2.10_2024.2.tar.gz
> +sha256  4d16661f367adb8713113acb420a1ad5f611ce6a309e98005a8ea3273511f03d  xlnx_rebase_v2.12_2025.1.tar.gz
> diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash
> index a970a878c2..0022390aa6 100644
> --- a/board/xilinx/patches/linux/linux.hash
> +++ b/board/xilinx/patches/linux/linux.hash
> @@ -1,2 +1,3 @@
>  # Locally calculated
>  sha256  b726226e8784d92049190f19768d393eccf3ad111c7a2e685bb29cfa1bdf1f70  xlnx_rebase_v6.6_LTS_merge_6.6.70.tar.gz
> +sha256  25795c354f30a3358506ab02deeac99e7f79850804c52d6c3d5539fd310f0491  xlnx_rebase_v6.12_LTS_2025.1.tar.gz
> diff --git a/board/xilinx/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash
> index de0e6adad1..56ee166378 100644
> --- a/board/xilinx/patches/uboot/uboot.hash
> +++ b/board/xilinx/patches/uboot/uboot.hash
> @@ -1,2 +1,3 @@
>  # Locally calculated
>  sha256  f1a86ccdbe60bac89177a24bbfd56fc6e8e67823669f0997de563c3cc0ea4dd1  xlnx_rebase_v2024.01_2024.2.tar.gz
> +sha256  b86d6f07d16a83ed0bdbd9b9439e099afc87ba7dfb77246e2472183848e2ea93  xlnx_rebase_v2025.01_2025.1.tar.gz

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/5] board/xilinx: add xilinx_v2025.1 support

[Julien Olivain]

On 02/06/2025 15:50, Neal Frager via buildroot wrote:
> Add hashes for xilinx_v2025.1 release.
> 
> xilinx_v2025.1 release includes:
>  - atf 2.12
>  - linux 6.12.10
>  - uboot 2025.01
> 
> In addition, the xilinx_v2025.1 linux kernel release tag has a Kconfig 
> leak
> of the CONFIG_XILINX_AIE option.  This patch adds a patch that is 
> specific to
> the Xilinx Linux 6.12.10 release which fixes the problem by moving the 
> changes
> implemented by the CONFIG_XILINX_AIE option from the exposed uapi 
> header file
> to the Linux internal header file.
> 
> The patch has been added to the board/xilinx/linux_6.12/patches 
> directory, so
> that it will only be applied when a user specifies they wish to build 
> the
> xilinx_v2025.1 release or they use a defconfig that has migrated to 
> this
> release.
> 
> Since the header file that causes the issue is not yet mainline, this 
> patch
> has been "upstreamed" to the Xilinx linux-xlnx repo via the AMD 
> internal jira
> process.
> 
> Upstream: internal AMD jira process
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Series applied to next, thanks.

For info, I fixed two minor check-package errors. See:
https://gitlab.com/buildroot.org/buildroot/-/commit/93c4e7bdbfd50d4ac1bb23ff48147728881eda7a

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot