[Buildroot] [PATCH v1 1/1] boot/xilinx-prebuilt: support future AMD Vivado versions

[Buildroot] [PATCH v1 1/1] boot/xilinx-prebuilt: support future AMD Vivado versions

[Neal Frager via buildroot]

When creating a hardware platform for AMD Versal devices with the AMD Vivado
Design Suite, the resulting XSA file has a file named "psm_fw.elf" included.
This does not match the "psmfw.elf" filename that users will get when building
the boot firmware from the Xilinx GIT repository.

A change request has been submitted to resolve this issue, so that future
AMD Vivado Design Suite versions will generate XSA files including the boot
firmware file named "psmfw.elf" to match the filename that is generated when
building the firmware.

In order to support both current and future versions of AMD Vivado Design
Suite, this patch changes the xilinx-prebuilt package to use the filename
"psm*fw.elf" when obtaining the Versal boot firmware images from a user
generated XSA file.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk
index 0b0e85b820..9f36ee7285 100644
--- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk
+++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk
@@ -34,8 +34,11 @@ 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
 # Unlike the psmfw.elf file for Xilinx development boards,
-# AMD Vivado Design Suite generates a file named psm_fw.elf.
-XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm_fw.elf
+# 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
 XILINX_PREBUILT_PDI = $(@D)/*.pdi
 else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
 XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf
-- 
2.25.1

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

Re: [Buildroot] [PATCH v1 1/1] boot/xilinx-prebuilt: support future AMD Vivado versions

[Thomas Petazzoni via buildroot]

On Mon, 29 Jul 2024 12:57:00 +0100
Neal Frager via buildroot <buildroot@buildroot.org> wrote:

> When creating a hardware platform for AMD Versal devices with the AMD Vivado
> Design Suite, the resulting XSA file has a file named "psm_fw.elf" included.
> This does not match the "psmfw.elf" filename that users will get when building
> the boot firmware from the Xilinx GIT repository.
> 
> A change request has been submitted to resolve this issue, so that future
> AMD Vivado Design Suite versions will generate XSA files including the boot
> firmware file named "psmfw.elf" to match the filename that is generated when
> building the firmware.
> 
> In order to support both current and future versions of AMD Vivado Design
> Suite, this patch changes the xilinx-prebuilt package to use the filename
> "psm*fw.elf" when obtaining the Versal boot firmware images from a user
> generated XSA file.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
>  boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

Applied to master, thanks.

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