From 38a682fe92047de4763ce0129ca194f73f5cb196 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 14 Jul 2022 18:05:38 -0500 Subject: [PATCH] payloads/tianocore: Use SMMSTORE when branch is MrChromeBox SMMSTORE support in edk2 was not allowed in upstream edk2 as it was bootloader specific. Shortly, it will be built from edk2-platforms and then, it will be retired. For now, the patches exist in the MrChromeBox fork (TIANOCORE_UEFIPAYLOAD), so enable these by default when SMMSTORE_v2 is enabled. Change-Id: I1861bf739c2e25f661b4f06a303348f0537dc8b3 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/65867 Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- payloads/external/Makefile.inc | 1 + payloads/external/tianocore/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index a4f7284c4a..d7a3ee7628 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -182,6 +182,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG) CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \ CONFIG_ECAM_MMCONF_LENGTH=$(CONFIG_ECAM_MMCONF_LENGTH) \ + CONFIG_SMMSTORE_V2=$(CONFIG_SMMSTORE_V2) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 0f81eabbf5..fe338ab5bc 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -212,6 +212,7 @@ endif config TIANOCORE_CUSTOM_BUILD_PARAMS string "TianoCore additional custom build parameters" + default "-D VARIABLE_SUPPORT=SMMSTORE" if TIANOCORE_UEFIPAYLOAD && SMMSTORE_V2 help edk2 has build options that are not modified by coreboot, and these can be found in `UefiPayloadPkg/UefiPayloadPkg.dsc`. Forks may also support