From fdfd0486c5859faca6a88ec8c9869473bc867e19 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 4 Sep 2025 22:12:36 +0100 Subject: [PATCH] boot/xilinx-prebuilt: add support for plmfw.elf filename 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 Reviewed-by: Luca Ceresoli Signed-off-by: Julien Olivain (cherry picked from commit 6f435187c6a9c5d847003e40c584c82a5db61dfd) Signed-off-by: Titouan Christophe --- 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 d0817d3cc7..0be4f0aabe 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -32,7 +32,8 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) # different boards, but there is only one, and it has to be named # vpl_gen_fixed.pdi when installed. 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, @@ -41,7 +42,8 @@ XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf 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 +# 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 XILINX_PREBUILT_PDI = $(XILINX_PREBUILT_BOARD_DIR)/*.pdi endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA