From ef855f19f057c1a46d25dfc34e8539ad1d4f7043 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 12 Mar 2025 14:48:06 -0500 Subject: [PATCH] soc/intel/meteorlake: Fix logic for FSP repo use Commit a7a76b0deea3 ("soc/intel/meteorlake: Hook up FSP repo for IOT") added logic to use the FSP repo for IOT boards, but in doing so broke the automatic selection of FSP_USE_REPO when HAVE_INTEL_FSP_REPO was selected. Fix this by removing the override for FSP_USE_REPO and selecting HAVE_INTEL_FSP_REPO when FSP_TYPE_IOT is selected. TEST=build/boot starlabs/starbook_mtl with IOT FSP binaries/headers Change-Id: Iad946a23c569e27cafa35ce2e6fefd6be1d90666 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/86845 Reviewed-by: Zhixing Ma Tested-by: build bot (Jenkins) Reviewed-by: Bora Guvendik --- src/soc/intel/meteorlake/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 5d1b3fe6d1..8a51abd496 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -25,6 +25,7 @@ config SOC_INTEL_METEORLAKE select GENERIC_GPIO_LIB select HAVE_DEBUG_RAM_SETUP select HAVE_FSP_GOP + select HAVE_INTEL_FSP_REPO if FSP_TYPE_IOT select HAVE_HYPERTHREADING select HAVE_INTEL_COMPLIANCE_TEST_MODE select HAVE_SMI_HANDLER @@ -346,15 +347,10 @@ config CONSOLE_CBMEM_BUFFER_SIZE config FSP_TYPE_IOT bool - select HAVE_INTEL_FSP_REPO default n help This option allows to select FSP IOT type from 3rdparty/fsp repo -config FSP_USE_REPO - default y if FSP_TYPE_IOT - default n - config FSP_HEADER_PATH string "Location of FSP headers" default "3rdparty/fsp/MeteorLakeFspBinPkg/IoT/MeteorLake/Include" if FSP_USE_REPO && FSP_TYPE_IOT