From d747b7aae11475d16424013c58ac7d2ba5d934d4 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 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.