[Buildroot] [PATCH v4 1/4] boot/xilinx-prebuilt: add support for plmfw.elf filename

[Buildroot] [PATCH v4 1/4] boot/xilinx-prebuilt: add support for plmfw.elf filename

[Neal Frager via buildroot]

AMD / Xilinx has made the decision to change the name of plm.elf to plmfw.elf
in the prebuilt binaries repo starting with the next update.

This patch updates the xilinx-prebuilt package to support either the old
plm.elf filename or the new plmfw.elf filename.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- no changes
V2->V3:
- removed unnecessary comment about Ubuntu and Yocto from commit message
V3->V4:
- no changes
---
 boot/xilinx-prebuilt/xilinx-prebuilt.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk
index 62b60b88fa..5d984c4f82 100644
--- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk
+++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk
@@ -28,7 +28,8 @@ XILINX_PREBUILT_BOARD_DIR = $(@D)/$(XILINX_PREBUILT_BOARD)-$(XILINX_PREBUILT_FAM
 
 ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y)
 ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA),y)
-XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf
+# 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,
@@ -60,7 +61,8 @@ define XILINX_PREBUILT_INSTALL_VERSAL_XSA_PLD_PDI
 endef
 endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_PLD_PDI
 else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
-XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf
+# 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.
-- 
2.25.1

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

[Buildroot] [PATCH v4 2/4] boot/xilinx-prebuilt: add hash for xilinx_v2025.1_update1 tag

[Neal Frager via buildroot]

Add the xilinx_v2025.1_update1 release tag hash to the xilinx-prebuilt
package, so that Xilinx boards can use this new release tag.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- new to patch series
V2->V3:
- improved commit message
V3->V4:
- no changes
---
 boot/xilinx-prebuilt/xilinx-prebuilt.hash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash
index 9f12e88e7a..a8dee8f129 100644
--- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash
+++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash
@@ -1,5 +1,6 @@
 # Locally calculated
 sha256  b9e2572885ad12243e10d48d9fccb24771a528b9f27aae1b29b45f0806ce9f1f  xilinx-prebuilt-xilinx_v2025.1.tar.gz
+sha256  48fd698a16f79b9a828c35ca5b2b50fe832149d1a2938c94c0bb6a2e249b0bed  xilinx-prebuilt-xilinx_v2025.1_update1.tar.gz
 
 # Locally calculated
 sha256  7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f  LICENSE
-- 
2.25.1

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

[Buildroot] [PATCH v4 3/4] configs/versal_vek280: bump xilinx-prebuilt to xilinx_v2025.1_update1

[Neal Frager via buildroot]

Bump the versal_vek280_defconfig to use version xilinx_v2025.1_update1 of the
xilinx-prebuilt boot pacakge.

As part of this update, the vek280 pdi file has been updated and the memory
map has been corrected to match the Linux intree dts memory node, so the
vek280 dts memory node patch is no longer required.

https://github.com/Xilinx/soc-prebuilt-firmware/commit/f755d022cd9bd2e6a09eed0f80078bca3345279e

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- new to patch series
V2->V3:
- improved commit message
V3->V4:
- rebase patch
---
 ...sal-vek280-prebuilt-pdi-is-incorrect.patch | 50 -------------------
 configs/versal_vek280_defconfig               |  3 +-
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 board/versal/vek280/patches/linux/0001-arm64-versal-vek280-prebuilt-pdi-is-incorrect.patch

diff --git a/board/versal/vek280/patches/linux/0001-arm64-versal-vek280-prebuilt-pdi-is-incorrect.patch b/board/versal/vek280/patches/linux/0001-arm64-versal-vek280-prebuilt-pdi-is-incorrect.patch
deleted file mode 100644
index 357c0abb2f..0000000000
--- a/board/versal/vek280/patches/linux/0001-arm64-versal-vek280-prebuilt-pdi-is-incorrect.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e79a96ff89b11fea03680633ab830894288ee9f0 Mon Sep 17 00:00:00 2001
-From: Neal Frager <neal.frager@amd.com>
-Date: Thu, 28 Nov 2024 07:50:28 +0000
-Subject: [PATCH] arm64: versal: vek280 prebuilt pdi is incorrect
-
-The prebuilt vpl_gen_fixed.pdi for the vek280 is incorrect and does not define
-the DDR memory region for address 0x8 0000 0000 - 0x8 8000 0000.  For this
-reason, the intree Linux dts memory node for the vek280 will not boot.
-
-This patch works around the issue until the prebuilt pdi file is changed.
-
-https://github.com/Xilinx/soc-prebuilt-firmware/blob/xilinx_v2024.2/vek280-versal/vpl_gen_fixed.pdi
-
-Upstream: n/a
-
-Signed-off-by: Neal Frager <neal.frager@amd.com>
----
- arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts | 2 +-
- arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
-index ad5d590318e6..a306eacca5b3 100644
---- a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
-+++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
-@@ -19,7 +19,7 @@ / {
- 
- 	memory: memory@0 {
- 		device_type = "memory";
--		reg = <0 0 0 0x80000000>, <0x8 0x0 0x1 0x80000000>; /* 2GB + 6GB */
-+		reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */
- 	};
- 
- 	chosen {
-diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
-index a5ee80a373e2..ba54a5ef0c73 100644
---- a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
-+++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
-@@ -19,7 +19,7 @@ / {
- 
- 	memory: memory@0 {
- 		device_type = "memory";
--		reg = <0 0 0 0x80000000>, <0x8 0x00000000 0x1 0x80000000>; /* 2GB + 6GB */
-+		reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */
- 	};
- 
- 	chosen {
--- 
-2.25.1
-
diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig
index 6c434199fc..d3a73b87bf 100644
--- a/configs/versal_vek280_defconfig
+++ b/configs/versal_vek280_defconfig
@@ -5,7 +5,7 @@ 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"
-BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches"
+BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
@@ -43,6 +43,7 @@ BR2_TARGET_XILINX_EMBEDDEDSW=y
 BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y
 BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2025.1_update1"
 BR2_TARGET_XILINX_PREBUILT_VERSAL=y
 BR2_TARGET_XILINX_PREBUILT_BOARD="vek280"
 BR2_PACKAGE_HOST_BOOTGEN=y
-- 
2.25.1

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

[Buildroot] [PATCH v4 4/4] boot/xilinx-prebuilt: bump default version to xilinx_v2025.1_update1

[Neal Frager via buildroot]

Bump the xilinx-prebuilt default version to xilinx_v2025.1_update1, so that
all versal defconfigs use this new release tag.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
- new to patch series
V2->V3:
- squashed the 4th and 5th patches of the series together
- improved commit message
V3->V4:
- no changes
---
 boot/xilinx-prebuilt/Config.in            | 2 +-
 boot/xilinx-prebuilt/xilinx-prebuilt.hash | 1 -
 configs/versal_vek280_defconfig           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in
index 836cd8b68a..1bc6b3b8e8 100644
--- a/boot/xilinx-prebuilt/Config.in
+++ b/boot/xilinx-prebuilt/Config.in
@@ -18,7 +18,7 @@ if BR2_TARGET_XILINX_PREBUILT
 
 config BR2_TARGET_XILINX_PREBUILT_VERSION
 	string "prebuilt version"
-	default "xilinx_v2025.1"
+	default "xilinx_v2025.1_update1"
 	help
 	  Release version of Xilinx firmware.
 	  Must be xilinx_v2023.1 or newer.
diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash
index a8dee8f129..6879b88d83 100644
--- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash
+++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash
@@ -1,5 +1,4 @@
 # Locally calculated
-sha256  b9e2572885ad12243e10d48d9fccb24771a528b9f27aae1b29b45f0806ce9f1f  xilinx-prebuilt-xilinx_v2025.1.tar.gz
 sha256  48fd698a16f79b9a828c35ca5b2b50fe832149d1a2938c94c0bb6a2e249b0bed  xilinx-prebuilt-xilinx_v2025.1_update1.tar.gz
 
 # Locally calculated
diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig
index d3a73b87bf..91d9240ff2 100644
--- a/configs/versal_vek280_defconfig
+++ b/configs/versal_vek280_defconfig
@@ -43,7 +43,6 @@ BR2_TARGET_XILINX_EMBEDDEDSW=y
 BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y
 BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y
 BR2_TARGET_XILINX_PREBUILT=y
-BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2025.1_update1"
 BR2_TARGET_XILINX_PREBUILT_VERSAL=y
 BR2_TARGET_XILINX_PREBUILT_BOARD="vek280"
 BR2_PACKAGE_HOST_BOOTGEN=y
-- 
2.25.1

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

Re: [Buildroot] [PATCH v4 1/4] boot/xilinx-prebuilt: add support for plmfw.elf filename

[Luca Ceresoli via buildroot]

On Thu, 4 Sep 2025 22:12:36 +0100
Neal Frager <neal.frager@amd.com> wrote:

> AMD / Xilinx has made the decision to change the name of plm.elf to plmfw.elf
> in the prebuilt binaries repo starting with the next update.
> 
> This patch updates the xilinx-prebuilt package to support either the old
> plm.elf filename or the new plmfw.elf filename.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

I had reviewed this series at v2, apparently you missed picking up my
R-by tags.

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

Luca

-- 
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 v4 2/4] boot/xilinx-prebuilt: add hash for xilinx_v2025.1_update1 tag

[Luca Ceresoli via buildroot]

On Thu, 4 Sep 2025 22:12:37 +0100
Neal Frager <neal.frager@amd.com> wrote:

> Add the xilinx_v2025.1_update1 release tag hash to the xilinx-prebuilt
> package, so that Xilinx boards can use this new release tag.
> 
> 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 v4 3/4] configs/versal_vek280: bump xilinx-prebuilt to xilinx_v2025.1_update1

[Luca Ceresoli via buildroot]

On Thu, 4 Sep 2025 22:12:38 +0100
Neal Frager <neal.frager@amd.com> wrote:

> Bump the versal_vek280_defconfig to use version xilinx_v2025.1_update1 of the
> xilinx-prebuilt boot pacakge.
> 
> As part of this update, the vek280 pdi file has been updated and the memory
> map has been corrected to match the Linux intree dts memory node, so the
> vek280 dts memory node patch is no longer required.
> 
> https://github.com/Xilinx/soc-prebuilt-firmware/commit/f755d022cd9bd2e6a09eed0f80078bca3345279e
> 
> 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 v4 4/4] boot/xilinx-prebuilt: bump default version to xilinx_v2025.1_update1

[Luca Ceresoli via buildroot]

On Thu, 4 Sep 2025 22:12:39 +0100
Neal Frager <neal.frager@amd.com> wrote:

> Bump the xilinx-prebuilt default version to xilinx_v2025.1_update1, so that
> all versal defconfigs use this new release tag.
> 
> 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 v4 1/4] boot/xilinx-prebuilt: add support for plmfw.elf filename

[Frager, Neal via buildroot]

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Luca,

> AMD / Xilinx has made the decision to change the name of plm.elf to plmfw.elf
> in the prebuilt binaries repo starting with the next update.
>
> This patch updates the xilinx-prebuilt package to support either the old
> plm.elf filename or the new plmfw.elf filename.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>

> I had reviewed this series at v2, apparently you missed picking up my
> R-by tags.

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

I modified the commit messages between v2 and v3, so since the patch was no
longer truly identical, I did not want to presume that your review still held.

Thank you for reviewing again!

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 1/4] boot/xilinx-prebuilt: add support for plmfw.elf filename

[Julien Olivain via buildroot]

On 04/09/2025 23:12, Neal Frager via buildroot wrote:
> AMD / Xilinx has made the decision to change the name of plm.elf to 
> plmfw.elf
> in the prebuilt binaries repo starting with the next update.
> 
> This patch updates the xilinx-prebuilt package to support either the 
> old
> plm.elf filename or the new plmfw.elf filename.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot