From 16562cb859ad323153a9fe6d8b3890cc7dd73093 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Sat, 20 Jul 2019 13:06:03 +0800 Subject: payloads/tianocore: Enable UEFIPayload corebootpayload package in upstream TianoCore was replaced with UEFIPayload, add external payload build option for UEFIPayload. BUG=N/A TEST=Select TianoCore payload as UEFIPayload, build and able to boot up on QEMU q35 after PCIE_BASE set. Change-Id: I0b7785fde9f4113b2cd91323ac0358b229c5a6e6 Signed-off-by: Lijian Zhao Reviewed-on: https://review.coreboot.org/c/coreboot/+/34459 Reviewed-by: Philipp Deppenwiese Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- payloads/external/Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'payloads/external/Makefile.inc') diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index df168f2bee..d5c4e7f5d3 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -128,14 +128,14 @@ payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd tianocore: $(DOTCONFI $(MAKE) -C payloads/external/tianocore all \ HOSTCC="$(HOSTCC)" \ CC="$(HOSTCC)" \ - CONFIG_TIANOCORE_MASTER=$(CONFIG_TIANOCORE_MASTER) \ - CONFIG_TIANOCORE_STABLE=$(CONFIG_TIANOCORE_STABLE) \ - CONFIG_TIANOCORE_REVISION=$(CONFIG_TIANOCORE_REVISION) \ CONFIG_TIANOCORE_REVISION_ID=$(CONFIG_TIANOCORE_REVISION_ID) \ CONFIG_TIANOCORE_DEBUG=$(CONFIG_TIANOCORE_DEBUG) \ CONFIG_TIANOCORE_TARGET_IA32=$(CONFIG_TIANOCORE_TARGET_IA32) \ CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ CONFIG_TIANOCORE_BOOTSPLASH_FILE=$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \ + CONFIG_TIANOCORE_UEFIPAYLOAD=$(CONFIG_TIANOCORE_UEFIPAYLOAD) \ + CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \ + CONFIG_MMCONF_BASE_ADDRESS=$(CONFIG_MMCONF_BASE_ADDRESS) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ -- cgit v1.2.3