| Message ID | 20240628152105.2233086-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] boot/xilinx-prebuilt/xilinx-prebuilt.mk: simplify variables | expand |
On 28/06/2024 17:21, Neal Frager via buildroot wrote: > This patch reduces the xilinx-prebuilt package to a single install variable > that changes depending on device family variant. > > Signed-off-by: Neal Frager <neal.frager@amd.com> Applied to master, thanks. Regards, Arnout > --- > boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk > index eb78ed10cd..0c5456f577 100644 > --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk > +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk > @@ -20,7 +20,7 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) > # We need the *.pdi glob, because the file has different names for the > # different boards, but htere is only one, and it has to be named > # vpl_gen_fixed.pdi when installed. > -define XILINX_PREBUILT_INSTALL_VERSAL > +define XILINX_PREBUILT_INSTALL > $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/plm.elf \ > $(BINARIES_DIR)/plm.elf > $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf \ > @@ -29,15 +29,14 @@ define XILINX_PREBUILT_INSTALL_VERSAL > $(BINARIES_DIR)/vpl_gen_fixed.pdi > endef > else # BR2_TARGET_XILINX_PREBUILT_VERSAL > -define XILINX_PREBUILT_INSTALL_OTHERS > +define XILINX_PREBUILT_INSTALL > $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ > $(BINARIES_DIR)/pmufw.elf > endef > endif # BR2_TARGET_XILINX_PREBUILT_VERSAL > > define XILINX_PREBUILT_INSTALL_IMAGES_CMDS > - $(XILINX_PREBUILT_INSTALL_VERSAL) > - $(XILINX_PREBUILT_INSTALL_OTHERS) > + $(XILINX_PREBUILT_INSTALL) > endef > > $(eval $(generic-package))
diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.mk b/boot/xilinx-prebuilt/xilinx-prebuilt.mk index eb78ed10cd..0c5456f577 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.mk +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.mk @@ -20,7 +20,7 @@ ifeq ($(BR2_TARGET_XILINX_PREBUILT_VERSAL),y) # We need the *.pdi glob, because the file has different names for the # different boards, but htere is only one, and it has to be named # vpl_gen_fixed.pdi when installed. -define XILINX_PREBUILT_INSTALL_VERSAL +define XILINX_PREBUILT_INSTALL $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/plm.elf \ $(BINARIES_DIR)/plm.elf $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/psmfw.elf \ @@ -29,15 +29,14 @@ define XILINX_PREBUILT_INSTALL_VERSAL $(BINARIES_DIR)/vpl_gen_fixed.pdi endef else # BR2_TARGET_XILINX_PREBUILT_VERSAL -define XILINX_PREBUILT_INSTALL_OTHERS +define XILINX_PREBUILT_INSTALL $(INSTALL) -D -m 0755 $(XILINX_PREBUILT_BOARD_DIR)/pmufw.elf \ $(BINARIES_DIR)/pmufw.elf endef endif # BR2_TARGET_XILINX_PREBUILT_VERSAL define XILINX_PREBUILT_INSTALL_IMAGES_CMDS - $(XILINX_PREBUILT_INSTALL_VERSAL) - $(XILINX_PREBUILT_INSTALL_OTHERS) + $(XILINX_PREBUILT_INSTALL) endef $(eval $(generic-package))
This patch reduces the xilinx-prebuilt package to a single install variable that changes depending on device family variant. Signed-off-by: Neal Frager <neal.frager@amd.com> --- boot/xilinx-prebuilt/xilinx-prebuilt.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)