[coreboot-gerrit] [S] Change in coreboot[main]: payloads/external/Makefile.mk: build iPXE for EDK2 with custom boot o...

[Filip Lewiński (Code Review)]

Attention is currently required from: Michał Kopeć.

Hello Michał Kopeć,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/82721?usp=email

to review the following change.

Change subject: payloads/external/Makefile.mk: build iPXE for EDK2 with custom boot option name
......................................................................

payloads/external/Makefile.mk: build iPXE for EDK2 with custom boot option name

Change-Id: Ied61c7b8aa7a34261d6c6f7fd089b1affdc7d3f6
Signed-off-by: Michał Kopeć 
---
M payloads/external/Makefile.mk
1 file changed, 16 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/82721/1

diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index d497cf8..045c93a 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -156,7 +156,11 @@

# edk2

-$(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG)
+ifeq ($(CONFIG_EDK2_ENABLE_IPXE),y)
+IPXE_EFI := payloads/external/iPXE/ipxe/ipxe.rom
+endif
+
+$(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
    $(MAKE) -C payloads/external/edk2 UefiPayloadPkg \
    	HOSTCC="$(HOSTCC)" \
    	CC="$(HOSTCC)" \
@@ -206,7 +210,8 @@
    	OBJCOPY_x86_64=$(OBJCOPY_x86_64) \
    	OBJCOPY_arm=$(OBJCOPY_arm) \
    	OBJCOPY_arm64=$(OBJCOPY_arm64) \
-		MFLAGS= MAKEFLAGS=
+		MFLAGS= MAKEFLAGS= \
+		CONFIG_EDK2_IPXE_OPTION_NAME=$(CONFIG_EDK2_IPXE_OPTION_NAME)

$(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG)
    $(MAKE) -C payloads/external/edk2 UniversalPayload \
@@ -364,13 +369,18 @@
 IPXE_SERIAL_CONSOLE = n
 endif

+ifneq ($(CONFIG_EDK2_ENABLE_IPXE),y)
 cbfs-files-$(CONFIG_PXE_ROM)$(CONFIG_BUILD_IPXE) += pci$(CONFIG_PXE_ROM_ID).rom
 pci$(CONFIG_PXE_ROM_ID).rom-file := $(PXE_ROM_FILE)
 pci$(CONFIG_PXE_ROM_ID).rom-type := raw
+IPXE_CROSS_COMPILE:="$(CROSS_COMPILE_$(ARCH-ramstage-y))"
+else
+IPXE_CROSS_COMPILE:=$(CROSS_COMPILE_x86_64)
+endif

payloads/external/iPXE/ipxe/ipxe.rom ipxe: $(DOTCONFIG) $(IPXE_CONFIG_SCRIPT)
    $(MAKE) -C payloads/external/iPXE all \
-	CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-ramstage-y))" \
+	CROSS_COMPILE=$(IPXE_CROSS_COMPILE) \
    PXE_ROM_PCI_ID=$(PXE_ROM_PCI_ID) \
    CONFIG_IPXE_MASTER=$(CONFIG_IPXE_MASTER) \
    CONFIG_IPXE_STABLE=$(CONFIG_IPXE_STABLE) \
@@ -382,7 +392,9 @@
    CONFIG_IPXE_NO_PROMPT=$(CONFIG_IPXE_NO_PROMPT) \
    CONFIG_IPXE_HAS_HTTPS=$(CONFIG_IPXE_HAS_HTTPS) \
    CONFIG_PXE_TRUST_CMD=$(CONFIG_PXE_TRUST_CMD) \
-	MFLAGS= MAKEFLAGS=
+	MFLAGS= MAKEFLAGS= \
+	CFLAGS_x86_64="$(CFLAGS_x86_64)" \
+	CONFIG_IPXE_BUILD_EFI=$(CONFIG_EDK2_ENABLE_IPXE) \

# LinuxBoot
 LINUXBOOT_CROSS_COMPILE_ARCH-$(CONFIG_LINUXBOOT_X86)        = x86_32