From 4423a0b3908845f77324109d98b6336ff0d6f62a Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 30 Oct 2025 14:08:34 -0500 Subject: [PATCH] payloads/edk2: Drop EDK2_UFS_ENABLE Kconfig option This option existed because the inclusion of the UFS driver in edk2 needed to be guarded due to some issues on non-UFS equipped devices. Those issues have been resolved in edk2, so the UFS driver does not need guarding anymore. Remove the EDK2_UFS_ENABLE Kconfig symbol definition, associated build logic, and selection from google/brya baseboard. TEST=build/boot UFS and non-UFS ChromeOS boards with edk2 payload. Change-Id: I3f20d503de4a642ee3fbb175c267e1f5f7328c8d Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/89857 Reviewed-by: Angel Pons Reviewed-by: Alicja Michalska Tested-by: build bot (Jenkins) --- payloads/external/Makefile.mk | 1 - payloads/external/edk2/Kconfig | 9 --------- payloads/external/edk2/Makefile | 4 ---- src/mainboard/google/brya/Kconfig | 1 - 4 files changed, 15 deletions(-) diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index 0ba9a02c27..b7d3516bfe 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_UFS_ENABLE=$(CONFIG_EDK2_UFS_ENABLE) \ 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) \ diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index a23400f752..f731bb1eda 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_UFS_ENABLE - bool "Enable UFS DXE driver in edk2" - depends on EDK2_REPO_MRCHROMEBOX - default n - help - Select this option to enable the UFS DXE driver in MrChromebox's fork of edk2. - It is needed for boards with UFS storage, but can cause issues with other boards, - so should only be enabled when needed. - config EDK2_PCO_MMIO_EMMC bool "Enable MMIO eMMC driver for AMD Picasso boards in edk2" depends on EDK2_REPO_MRCHROMEBOX diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 168c511562..e55b6b5354 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 -# UFS_ENABLE = FALSE -ifeq ($(CONFIG_EDK2_UFS_ENABLE),y) -BUILD_STR += -D UFS_ENABLE=TRUE -endif # USE_PCO_MMIO_EMMC = FALSE ifeq ($(CONFIG_EDK2_PCO_MMIO_EMMC),y) BUILD_STR += -D USE_PCO_MMIO_EMMC=TRUE diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index e1524bd206..a60dd5386a 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -25,7 +25,6 @@ config BOARD_GOOGLE_BRYA_COMMON select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_SKUID select EC_GOOGLE_CHROMEEC_SMBIOS - select EDK2_UFS_ENABLE if EDK2_REPO_MRCHROMEBOX select ENABLE_TCSS_USB_DETECTION if !(SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION || CHROMEOS) select FW_CONFIG select FW_CONFIG_SOURCE_CHROMEEC_CBI