diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index b7d3516bfe..c0882c426d 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -196,7 +196,6 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) CONFIG_EDK2_GOP_FILE=$(CONFIG_EDK2_GOP_FILE) \ CONFIG_INTEL_GMA_VBT_FILE=$(CONFIG_INTEL_GMA_VBT_FILE) \ CONFIG_EDK2_DISABLE_TPM=$(CONFIG_EDK2_DISABLE_TPM) \ - CONFIG_EDK2_PCO_MMIO_EMMC=$(CONFIG_EDK2_PCO_MMIO_EMMC) \ CONFIG_EDK2_USE_LAPIC_TIMER=$(CONFIG_EDK2_USE_LAPIC_TIMER) \ CONFIG_SOC_AMD_COMMON_BLOCK_PSP_GEN2=$(CONFIG_SOC_AMD_COMMON_BLOCK_PSP_GEN2) \ CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=$(CONFIG_DRIVERS_EFI_UPDATE_CAPSULES) \ diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index f731bb1eda..583de2dc1d 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -298,15 +298,6 @@ config EDK2_DISABLE_TPM Select this option to disable TPM support in edk2. This is necessary to avoid boot hangs on some boards with a CR50 TPM, particularly those with an AMD Zen SoC. -config EDK2_PCO_MMIO_EMMC - bool "Enable MMIO eMMC driver for AMD Picasso boards in edk2" - depends on EDK2_REPO_MRCHROMEBOX - default n - help - Select this option to enable the MMIO eMMC DXE driver in MrChromebox's fork of edk2. - It is needed for AMD Picasso boards with eMMC storage, but will conflict with the - PCI-based eMMC driver, so should only be enabled for AMD Picasso boards. - config EDK2_USE_LAPIC_TIMER bool "Use LAPIC timer instead of HPET" default n diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index e55b6b5354..1b8ca2e67b 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -150,10 +150,6 @@ endif ifeq ($(CONFIG_EDK2_DISABLE_TPM),y) BUILD_STR += -D TPM_ENABLE=FALSE endif -# USE_PCO_MMIO_EMMC = FALSE -ifeq ($(CONFIG_EDK2_PCO_MMIO_EMMC),y) -BUILD_STR += -D USE_PCO_MMIO_EMMC=TRUE -endif # TIMER_SUPPORT = HPET ifeq ($(CONFIG_EDK2_USE_LAPIC_TIMER),y) BUILD_STR += -D TIMER_SUPPORT=LAPIC diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 2cb296408c..b998de0f1c 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -63,7 +63,6 @@ config BOARD_SPECIFIC_OPTIONS select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG select EC_GOOGLE_CHROMEEC_SKUID select EC_GOOGLE_CHROMEEC_SMBIOS - select EDK2_PCO_MMIO_EMMC if EDK2_REPO_MRCHROMEBOX select ELOG select ELOG_BOOT_COUNT select ELOG_GSMI