erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

payloads/edk2: Drop EDK2_UFS_ENABLE Kconfig option

Browse source 
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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89857
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Alicja Michalska <ahplka19@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2025-10-30 14:08:34 -05:00
commit 4423a0b390
4 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
payloads/external/Makefile.mk vendored
View file

@ -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) \

9
payloads/external/edk2/Kconfig vendored
View file

@ -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

4
payloads/external/edk2/Makefile vendored
View file

@ -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

1
src/mainboard/google/brya/Kconfig
View file

@ -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