Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52191 )
Change subject: payloads/tianocore: Fix compilation for UEFIPAYLOAD option ......................................................................
payloads/tianocore: Fix compilation for UEFIPAYLOAD option
Upstream edk2 dropped separate 32-bit support for UefiPayloadPkg, and removed the architecture suffix from the package dsc filename.
Test: build/run qemu with CONFIG_TIANOCORE_UEFIPAYLOAD selected.
Change-Id: I40077f1d370f0cb5627645b305b57e6c71e44095 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M payloads/external/tianocore/Makefile 1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/52191/1
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 198c17f..7cd34f1 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -39,10 +39,14 @@
TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
+ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y) ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y) -ARCH=-a IA32 -p $(bootloader)/$(bootloader)Ia32.dsc +ARCH=-a IA32 -p CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc else -ARCH=-a IA32 -a X64 -p $(bootloader)/$(bootloader)Ia32X64.dsc +ARCH=-a IA32 -a X64 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc +endif +else +ARCH=-a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc endif
BUILD_STR=-q $(ARCH) -t COREBOOT -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT) $(build_flavor)