mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

board/versal: change pdi filename to boot.pdi

Browse Source 
With the Segmented Configuration, the Versal PDI files will have new names:
<design>_boot.pdi - Minimal DDR and PS config for booting
<design>_pld.pdi - Remainder of FPGA design to be loaded at run-time

Since this will be the new default, this patch aligns the Buildroot file
naming by replacing the obscure vpl_gen_fixed.pdi filename with a simpler
boot.pdi filename.

Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Neal Frager
2025-05-19 09:36:30 +01:00
committed by Julien Olivain
parent a0a92928db
commit 3ee8569037
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/versal/post-image.sh
View File

@@ -17,7 +17,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif"
the_ROM_image: the_ROM_image:
{ {
image { image {
{ type=bootimage, file=${BINARIES_DIR}/vpl_gen_fixed.pdi } { type=bootimage, file=${BINARIES_DIR}/boot.pdi }
{ type=bootloader, file=${BINARIES_DIR}/plm.elf } { type=bootloader, file=${BINARIES_DIR}/plm.elf }
{ core=psm, file=${BINARIES_DIR}/psmfw.elf } { core=psm, file=${BINARIES_DIR}/psmfw.elf }
} }

8
boot/xilinx-prebuilt/xilinx-prebuilt.mk
View File

@@ -37,7 +37,7 @@ XILINX_PREBUILT_PLM = $(@D)/pdi_files/gen_files/plm.elf
# psm*fw.elf is used. # psm*fw.elf is used.
XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf XILINX_PREBUILT_PSMFW = $(@D)/pdi_files/static_files/psm*fw.elf
# We need the *.pdi glob, because the file has different names for the # We need the *.pdi glob, because the file has different names for the
# different boards, and it has to be named vpl_gen_fixed.pdi when installed. # different boards, and it has to be named boot.pdi when installed.
# If Segmented Configuration is used, there will be two pdi files and we need # If Segmented Configuration is used, there will be two pdi files and we need
# the file that has "_boot.pdi" in the filename. # the file that has "_boot.pdi" in the filename.
define XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI define XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI
@@ -46,13 +46,13 @@ define XILINX_PREBUILT_INSTALL_VERSAL_XSA_BOOT_PDI
$(@D)/*_boot.pdi, \ $(@D)/*_boot.pdi, \
$(@D)/*.pdi \ $(@D)/*.pdi \
) \ ) \
$(BINARIES_DIR)/vpl_gen_fixed.pdi $(BINARIES_DIR)/boot.pdi
endef endef
else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA else # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA
XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf XILINX_PREBUILT_PLM = $(XILINX_PREBUILT_BOARD_DIR)/plm.elf
XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf XILINX_PREBUILT_PSMFW = $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf
# We need the *.pdi glob, because the file has different names for the # We need the *.pdi glob, because the file has different names for the
# different boards, and it has to be named vpl_gen_fixed.pdi when installed. # different boards, and it has to be named boot.pdi when installed.
# If Segmented Configuration is used, there will be two pdi files and we need # If Segmented Configuration is used, there will be two pdi files and we need
# the file that has "_boot.pdi" in the filename. # the file that has "_boot.pdi" in the filename.
define XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI define XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI
@@ -61,7 +61,7 @@ define XILINX_PREBUILT_INSTALL_VERSAL_BOOT_PDI
$(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi, \ $(XILINX_PREBUILT_BOARD_DIR)/*_boot.pdi, \
$(XILINX_PREBUILT_BOARD_DIR)/*.pdi \ $(XILINX_PREBUILT_BOARD_DIR)/*.pdi \
) \ ) \
$(BINARIES_DIR)/vpl_gen_fixed.pdi $(BINARIES_DIR)/boot.pdi
endef endef
endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA endif # BR2_TARGET_XILINX_PREBUILT_VERSAL_XSA