From 4081793ff2c8b813370d87d0ebbf8e8c945610cb Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 16 Nov 2025 15:42:36 -0600 Subject: [PATCH] payloads/external/edk2: Replace dependencies on EDK2_REPO_MRCHROMEBOX Replace positive dependency on EDK2_REPO_MRCHROMEBOX with negative dependency on EDK2_REPO_OFFICIAL for downstream-specific features. This makes the logic more generic and allows other downstream repos to use these features. Options which were selected by default when EDK2_REPO_MRCHROMEBOX is used remain unchanged. Change-Id: Ia31e48c5a04d8db8b0f5250a6302123361cc3660 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90057 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- payloads/external/edk2/Kconfig | 10 +++++----- payloads/external/edk2/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index 583de2dc1d..dc76251fb2 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -212,7 +212,7 @@ config EDK2_CPU_TIMER_LIB config EDK2_FOLLOW_BGRT_SPEC bool "Center logo 38.2% from the top of screen" - depends on EDK2_REPO_MRCHROMEBOX + depends on !EDK2_REPO_OFFICIAL default n help Follow the BGRT Specification implemented by Microsoft and @@ -235,14 +235,14 @@ config EDK2_HAVE_EFI_SHELL config EDK2_PRIORITIZE_INTERNAL bool "Prioritize internal boot devices" - depends on EDK2_REPO_MRCHROMEBOX + depends on !EDK2_REPO_OFFICIAL default y help Prioritize internal boot devices over external devices config EDK2_LOAD_OPTION_ROMS bool "Load and Execute OpROMs on PCIe devices" - depends on EDK2_REPO_MRCHROMEBOX + depends on !EDK2_REPO_OFFICIAL default n help Load and execute OpROMs on PCIe devices. @@ -271,7 +271,7 @@ config EDK2_SERIAL_SUPPORT config EDK2_SECURE_BOOT_SUPPORT bool "Enable UEFI Secure Boot support" - depends on EDK2_REPO_MRCHROMEBOX && SMMSTORE_V2 + depends on !EDK2_REPO_OFFICIAL && SMMSTORE_V2 default y if EDK2_REPO_MRCHROMEBOX && SMMSTORE_V2 help Select this option to enable UEFI SecureBoot support in edk2. @@ -279,7 +279,7 @@ config EDK2_SECURE_BOOT_SUPPORT config EDK2_GOP_DRIVER bool "Add a GOP driver to the Tianocore build" - depends on INTEL_GMA_ADD_VBT && NO_GFX_INIT && EDK2_REPO_MRCHROMEBOX + depends on INTEL_GMA_ADD_VBT && NO_GFX_INIT && !EDK2_REPO_OFFICIAL default y if INTEL_GMA_ADD_VBT && NO_GFX_INIT && EDK2_REPO_MRCHROMEBOX help Select this option to have edk2 use an external GOP driver for display init. diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 0b343b3d7a..4eaf80b50e 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -130,9 +130,9 @@ BUILD_STR += -D CAPSULE_MAIN_FW_GUID=$(CONFIG_DRIVERS_EFI_MAIN_FW_GUID) endif # -# The MrChromebox repository has the following addition options: +# One or more downstream edk2 repositories support the following additional options: # -ifeq ($(CONFIG_EDK2_REPO_MRCHROMEBOX),y) +ifeq ($(CONFIG_EDK2_REPO_OFFICIAL),) # FOLLOW_BGRT_SPEC = FALSE ifeq ($(CONFIG_EDK2_FOLLOW_BGRT_SPEC),y) @@ -159,7 +159,7 @@ ifeq ($(CONFIG_EDK2_LOAD_OPTION_ROMS),y) BUILD_STR += -D LOAD_OPTION_ROMS=TRUE endif -endif +endif # !CONFIG_EDK2_REPO_OFFICIAL # # EDKII has the below PCDs that are relevant to coreboot: