diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2021-04-06 13:47:31 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-04-10 20:24:50 +0000 |
| commit | 544d7e2b9136adcf0e17c41447c9c13a31c9dae1 (patch) | |
| tree | ad88b39f82c0b710f30e6b880e3adfbbe4a1aaa5 | |
| parent | af13a6ed286a94543b22a232d99577d91d6c235f (diff) | |
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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52191
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | payloads/external/tianocore/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 198c17f6fe..7cd34f1732 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -39,10 +39,14 @@ endif 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) |