From 71d8f7c2b655e3444c794f17f7a9765590b7f382 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 9 Mar 2024 09:20:18 -0600 Subject: payloads/edk2: Add Kconfig to enable UFS support Add a Kconfig to selectively enable the UFS DXE driver recently added to MrChromebox's edk2 fork. When selected, will enable booting from devices with UFS storage. TEST=tested with rest of patch train Change-Id: I0b54d21dc87abf6938c03948830f92ce5097ef7d Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/81870 Reviewed-by: Sean Rhodes Tested-by: build bot (Jenkins) --- payloads/external/Makefile.mk | 1 + payloads/external/edk2/Kconfig | 9 +++++++++ payloads/external/edk2/Makefile | 4 ++++ 3 files changed, 14 insertions(+) (limited to 'payloads') diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index f1dc5cc4ad..9b79f1a3fa 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -195,6 +195,7 @@ $(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) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index 865ae67ad0..1216084743 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -290,6 +290,15 @@ 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_CUSTOM_BUILD_PARAMS string "edk2 additional custom build parameters" default "-D VARIABLE_SUPPORT=SMMSTORE" if EDK2_REPO_MRCHROMEBOX && SMMSTORE_V2 diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index b03f1d529e..dd95942f2d 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -137,6 +137,10 @@ 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 endif -- cgit v1.2.3