[M] Change in coreboot[main]: payloads/external: Use (PAYLOADS_DIR) instead of "payloads/external"
Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/87457?usp=email )
Change subject: payloads/external: Use (PAYLOADS_DIR) instead of "payloads/external" ......................................................................
payloads/external: Use (PAYLOADS_DIR) instead of "payloads/external"
Change-Id: Iac9d33f57374c51802321ad91d9c12d6b98a93ec Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M payloads/external/Makefile.mk 1 file changed, 47 insertions(+), 44 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/87457/1
diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index 5e8c91f..7dc1840 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -1,17 +1,20 @@ ## SPDX-License-Identifier: GPL-2.0-only
+PAYLOADS_DIR=$(PAYLOADS_DIR) +comma := , + # set up payload config and version files for later inclusion ifeq ($(CONFIG_PAYLOAD_BUILD_SEABIOS),y) -PAYLOAD_CONFIG=payloads/external/SeaBIOS/seabios/.config -PAYLOAD_VERSION=payloads/external/SeaBIOS/seabios/out/autoversion.h +PAYLOAD_CONFIG=$(PAYLOADS_DIR)/SeaBIOS/seabios/.config +PAYLOAD_VERSION=$(PAYLOADS_DIR)/SeaBIOS/seabios/out/autoversion.h endif ifeq ($(CONFIG_PAYLOAD_FILO),y) -PAYLOAD_CONFIG=payloads/external/FILO/filo/.config -PAYLOAD_VERSION=payloads/external/FILO/filo/build/version.h +PAYLOAD_CONFIG=$(PAYLOADS_DIR)/FILO/filo/.config +PAYLOAD_VERSION=$(PAYLOADS_DIR)/FILO/filo/build/version.h endif ifeq ($(CONFIG_PAYLOAD_DEPTHCHARGE),y) -PAYLOAD_CONFIG=payloads/external/depthcharge/depthcharge/.config -$(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.elf +PAYLOAD_CONFIG=$(PAYLOADS_DIR)/depthcharge/depthcharge/.config +$(PAYLOAD_CONFIG): $(PAYLOADS_DIR)/depthcharge/depthcharge/build/depthcharge.elf ifeq ($(call strip_quotes,$(CONFIG_MAINBOARD_DEPTHCHARGE)),) BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) else @@ -61,9 +64,9 @@ # SeaBIOS
SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) -SEABIOS_TARGET_PATH=payloads/external/SeaBIOS/seabios/out/bios.bin.elf +SEABIOS_TARGET_PATH=$(PAYLOADS_DIR)/SeaBIOS/seabios/out/bios.bin.elf $(SEABIOS_TARGET_PATH): $(DOTCONFIG) - $(MAKE) -C payloads/external/SeaBIOS \ + $(MAKE) -C $(PAYLOADS_DIR)/SeaBIOS \ HOSTCC="$(HOSTCC)" \ CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \ CFLAGS="$(patsubst $(word $(SEABIOS_CC_OFFSET),$(CC_x86_32))%,,$(wordlist $(SEABIOS_CC_OFFSET),9999,$(CC_x86_32)))" \ @@ -89,9 +92,9 @@ CONFIG_CONSOLE_UART_BASE_ADDRESS=$(CONFIG_CONSOLE_UART_BASE_ADDRESS) \ CONFIG_SEABIOS_HARDWARE_IRQ=$(CONFIG_SEABIOS_HARDWARE_IRQ)
-payloads/external/SeaBIOS/seabios/out/vgabios.bin: $(SEABIOS_TARGET_PATH) -payloads/external/SeaBIOS/seabios/.config: $(SEABIOS_TARGET_PATH) -payloads/external/SeaBIOS/seabios/out/autoversion.h: $(SEABIOS_TARGET_PATH) +$(PAYLOADS_DIR)/SeaBIOS/seabios/out/vgabios.bin: $(SEABIOS_TARGET_PATH) +$(PAYLOADS_DIR)/SeaBIOS/seabios/.config: $(SEABIOS_TARGET_PATH) +$(PAYLOADS_DIR)/SeaBIOS/seabios/out/autoversion.h: $(SEABIOS_TARGET_PATH)
cbfs-files-$(CONFIG_SEABIOS_SECONDARY_PAYLOAD) += img/seabios img/seabios-file := $(SEABIOS_TARGET_PATH) @@ -142,8 +145,8 @@
# Depthcharge
-payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) - $(MAKE) -C payloads/external/depthcharge \ +$(PAYLOADS_DIR)/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) + $(MAKE) -C $(PAYLOADS_DIR)/depthcharge \ BOARD=$(BOARD) \ MFLAGS= MAKEFLAGS= \ DEPTHCHARGE_REPO=$(CONFIG_DEPTHCHARGE_REPO) \ @@ -157,7 +160,7 @@ # edk2
$(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) - $(MAKE) -C payloads/external/edk2 UefiPayloadPkg \ + $(MAKE) -C $(PAYLOADS_DIR)/edk2 UefiPayloadPkg \ HOSTCC="$(HOSTCC)" \ CC="$(HOSTCC)" \ CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \ @@ -210,7 +213,7 @@ MFLAGS= MAKEFLAGS=
$(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG) - $(MAKE) -C payloads/external/edk2 UniversalPayload \ + $(MAKE) -C $(PAYLOADS_DIR)/edk2 UniversalPayload \ HOSTCC="$(HOSTCC)" \ CC="$(HOSTCC)" \ CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \ @@ -253,7 +256,7 @@ # FILO
filo: - $(MAKE) -C payloads/external/FILO \ + $(MAKE) -C $(PAYLOADS_DIR)/FILO \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -263,13 +266,13 @@ CONFIG_FILO_AUTOBOOT_FILE=$(CONFIG_FILO_AUTOBOOT_FILE) \ CONFIG_FILO_AUTOBOOT_DELAY=$(CONFIG_FILO_AUTOBOOT_DELAY)
-payloads/external/FILO/filo/build/filo.elf: filo -payloads/external/FILO/filo/.config: filo -payloads/external/FILO/filo/build/version.h: filo +$(PAYLOADS_DIR)/FILO/filo/build/filo.elf: filo +$(PAYLOADS_DIR)/FILO/filo/.config: filo +$(PAYLOADS_DIR)/FILO/filo/build/version.h: filo
# Grub
-GRUB_TARGET_PATH=payloads/external/GRUB2/grub2/build/default_payload.elf +GRUB_TARGET_PATH=$(PAYLOADS_DIR)/GRUB2/grub2/build/default_payload.elf
cbfs-files-$(CONFIG_GRUB2_SECONDARY_PAYLOAD) += img/grub2 img/grub2-file := $(GRUB_TARGET_PATH) @@ -277,7 +280,7 @@ img/grub2-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
grub2: $(obj)/config.h - $(MAKE) -C payloads/external/GRUB2 \ + $(MAKE) -C $(PAYLOADS_DIR)/GRUB2 \ HOSTCC="$(HOSTCC)" \ CC="$(CC_x86_32)" LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ @@ -292,19 +295,19 @@
# U-Boot
-payloads/external/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG) - $(MAKE) -C payloads/external/U-Boot \ +$(PAYLOADS_DIR)/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG) + $(MAKE) -C $(PAYLOADS_DIR)/U-Boot \ STABLE_COMMIT_ID=$(CONFIG_UBOOT_STABLE_COMMIT_ID) \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
# TINT
-payloads/external/tint/tint/tint.elf tint: - $(MAKE) -C payloads/external/tint +$(PAYLOADS_DIR)/tint/tint/tint.elf tint: + $(MAKE) -C $(PAYLOADS_DIR)/tint
cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint -img/tint-file := payloads/external/tint/tint/tint.elf +img/tint-file := $(PAYLOADS_DIR)/tint/tint/tint.elf img/tint-type := payload img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
@@ -317,7 +320,7 @@ endif
cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest -img/memtest-file := payloads/external/Memtest86Plus/$(memtest_dir)/memtest +img/memtest-file := $(PAYLOADS_DIR)/Memtest86Plus/$(memtest_dir)/memtest img/memtest-type := payload img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
@@ -327,8 +330,8 @@ SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) endif
-payloads/external/Memtest86Plus/$(memtest_dir)/memtest: $(DOTCONFIG) - $(MAKE) -C payloads/external/Memtest86Plus all \ +$(PAYLOADS_DIR)/Memtest86Plus/$(memtest_dir)/memtest: $(DOTCONFIG) + $(MAKE) -C $(PAYLOADS_DIR)/Memtest86Plus all \ CC="$(CC_x86_32)" \ LD="$(LD_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" \ @@ -350,7 +353,7 @@ PXE_ROM_FILE:=$(call strip_quotes,$(CONFIG_PXE_ROM_FILE)) endif ifeq ($(CONFIG_BUILD_IPXE),y) -PXE_ROM_FILE:=payloads/external/iPXE/ipxe/ipxe.rom +PXE_ROM_FILE:=$(PAYLOADS_DIR)/iPXE/ipxe/ipxe.rom endif ifeq ($(CONFIG_IPXE_ADD_SCRIPT),y) IPXE_CONFIG_SCRIPT:=$(abspath $(patsubst "%",%,$(CONFIG_IPXE_SCRIPT))) @@ -369,8 +372,8 @@ pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE) pci$(CONFIG_PXE_ROM_ID).rom-type := raw
-payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(IPXE_CONFIG_SCRIPT) - $(MAKE) -C payloads/external/iPXE all \ +$(PAYLOADS_DIR)/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(IPXE_CONFIG_SCRIPT) + $(MAKE) -C $(PAYLOADS_DIR)/iPXE all \ CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \ PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \ CONFIG_IPXE_MASTER=$(CONFIG_IPXE_MASTER) \ @@ -403,8 +406,8 @@ endif # CONFIG_PAYLOAD_LINUXBOOT endif # CONFIG_LINUXBOOT_CROSS_COMPILE .PHONY: linuxboot -payloads/external/LinuxBoot/build/Image payloads/external/LinuxBoot/build/initramfs linuxboot: - $(MAKE) -C payloads/external/LinuxBoot \ +$(PAYLOADS_DIR)/LinuxBoot/build/Image $(PAYLOADS_DIR)/LinuxBoot/build/initramfs linuxboot: + $(MAKE) -C $(PAYLOADS_DIR)/LinuxBoot \ CPUS=$(CPUS) \ CONFIG_LINUXBOOT_X86_64=$(CONFIG_LINUXBOOT_X86_64) \ CONFIG_LINUXBOOT_X86=$(CONFIG_LINUXBOOT_X86) \ @@ -431,33 +434,33 @@ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ CONFIG_LINUXBOOT_DTS_FILE=$(CONFIG_LINUXBOOT_DTS_FILE) \ - $(subst payloads/external/LinuxBoot/,,$@) + $(subst $(PAYLOADS_DIR)/LinuxBoot/,,$@)
# BOOTBOOT
-payloads/external/BOOTBOOT/bootboot/dist/bootbootcb.elf: - $(MAKE) -C payloads/external/BOOTBOOT all +$(PAYLOADS_DIR)/BOOTBOOT/bootboot/dist/bootbootcb.elf: + $(MAKE) -C $(PAYLOADS_DIR)/BOOTBOOT all
# skiboot
-payloads/external/skiboot/build/skiboot.elf: - $(MAKE) -C payloads/external/skiboot all \ +$(PAYLOADS_DIR)/skiboot/build/skiboot.elf: + $(MAKE) -C $(PAYLOADS_DIR)/skiboot all \ CONFIG_SKIBOOT_GIT_REPO=$(CONFIG_SKIBOOT_GIT_REPO) \ CONFIG_SKIBOOT_REVISION=$(CONFIG_SKIBOOT_REVISION)
# leanefi
-payloads/external/leanefi/leanefi/build/leanefi.elf: FORCE $(DOTCONFIG) - $(MAKE) -C payloads/external/leanefi +$(PAYLOADS_DIR)/leanefi/leanefi/build/leanefi.elf: FORCE $(DOTCONFIG) + $(MAKE) -C $(PAYLOADS_DIR)/leanefi FORCE: ;
# COREDOOM
-payloads/external/coreDOOM/coredoom/doomgeneric/coredoom.elf coredoom: - $(MAKE) -C payloads/external/coreDOOM +$(PAYLOADS_DIR)/coreDOOM/coredoom/doomgeneric/coredoom.elf coredoom: + $(MAKE) -C $(PAYLOADS_DIR)/coreDOOM
cbfs-files-$(CONFIG_COREDOOM_SECONDARY_PAYLOAD) += img/coreDOOM -img/coreDOOM-file := payloads/external/coreDOOM/coredoom/doomgeneric/coredoom.elf +img/coreDOOM-file := $(PAYLOADS_DIR)/coreDOOM/coredoom/doomgeneric/coredoom.elf img/coreDOOM-type := payload img/coreDOOM-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) # WAD file
-
Elyes Haouas (Code Review)