Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83737?usp=email )
(
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: payloads/edk2: set VARIABLE_SUPPORT=SMMSTORE on CONFIG_SMMSTORE_V2 ......................................................................
payloads/edk2: set VARIABLE_SUPPORT=SMMSTORE on CONFIG_SMMSTORE_V2
Official EDK2 repository has VARIABLE_SUPPORT defaulting to EMU in UefiPayloadPkg, switch it to SMMSTORE if coreboot is built with SMMSTOREv2.
This removes custom default of EDK2_CUSTOM_BUILD_PARAMS for EDK2_REPO_MRCHROMEBOX which is unnecessary now.
Change-Id: Ic59f89c0f708f9b144bd35cd18870d0e1c65677d Signed-off-by: Sergii Dmytruk sergii.dmytruk@3mdeb.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/83737 Reviewed-by: Matt DeVillier matt.devillier@gmail.com Reviewed-by: Maximilian Brune maximilian.brune@9elements.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M payloads/external/edk2/Kconfig M payloads/external/edk2/Makefile 2 files changed, 3 insertions(+), 1 deletion(-)
Approvals: Maximilian Brune: Looks good to me, approved Matt DeVillier: Looks good to me, but someone else must approve build bot (Jenkins): Verified
diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index 57e38b9..0f88d36 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -319,7 +319,7 @@
config EDK2_CUSTOM_BUILD_PARAMS string "edk2 additional custom build parameters" - default "-D VARIABLE_SUPPORT=SMMSTORE" if EDK2_REPO_MRCHROMEBOX && SMMSTORE_V2 + default "" help edk2 has build options that are not modified by coreboot, and these can be found in `UefiPayloadPkg/UefiPayloadPkg.dsc`. Forks may also support diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 3966b91..e198623 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -69,8 +69,10 @@ ifneq ($(CONFIG_EDK2_SERIAL_SUPPORT),y) BUILD_STR += -D DISABLE_SERIAL_TERMINAL=TRUE endif +# VARIABLE_SUPPORT = EMU # MAX_VARIABLE_SIZE = 0x10000 ifeq ($(CONFIG_SMMSTORE_V2),y) +BUILD_STR += -D VARIABLE_SUPPORT=SMMSTORE BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize=0x8000 endif # PCIE_BASE_ADDRESS = 0