From 549e4d8d9ed4f9dbca92cb85cc7fa414a9582915 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 29 Jul 2024 12:57:00 +0100 Subject: [PATCH] boot/xilinx-prebuilt: support future AMD Vivado versions 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 Signed-off-by: Thomas Petazzoni --- 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