From 415932097a8fc61690a051877edb02c6ed6a05fd Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Thu, 23 May 2024 16:15:22 +0530 Subject: soc/intel/meteorlake: Tailor FSP Version Selection for Architecture * Conditionally select FSP 2.4 when x86_64 support is available (HAVE_X86_64_SUPPORT). * Default to FSP 2.3 otherwise. * Adjust default FSP header path to align with architecture. BUG=b:242829490 TEST=Able to build google/rex in both 32-bit and 64-bit mode. Change-Id: Ib77a34c6bf7bca3485a197f109d1550ac3d51cc0 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/82624 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Dinesh Gehlot Reviewed-by: Kapil Porwal --- src/soc/intel/meteorlake/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 566e88c37b..622d35f529 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -42,7 +42,8 @@ config SOC_INTEL_METEORLAKE select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK select PCIE_CLOCK_CONTROL_THROUGH_P2SB - select PLATFORM_USES_FSP2_3 + select PLATFORM_USES_FSP2_4 if HAVE_X86_64_SUPPORT + select PLATFORM_USES_FSP2_3 if !HAVE_X86_64_SUPPORT select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE @@ -347,7 +348,7 @@ config CONSOLE_CBMEM_BUFFER_SIZE config FSP_HEADER_PATH string "Location of FSP headers" - default "src/vendorcode/intel/fsp/fsp2_0/meteorlake/x86_64/" if PLATFORM_USES_FSP2_4 + default "src/vendorcode/intel/fsp/fsp2_0/meteorlake/x86_64/" if HAVE_X86_64_SUPPORT default "src/vendorcode/intel/fsp/fsp2_0/meteorlake/x86_32/" config FSP_FD_PATH -- cgit v1.2.3