summaryrefslogtreecommitdiff
path: root/src/soc/intel/meteorlake
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/meteorlake')
-rw-r--r--src/soc/intel/meteorlake/Kconfig26
-rw-r--r--src/soc/intel/meteorlake/fsp_params.c2
2 files changed, 2 insertions, 26 deletions
diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 03782ddaaa..27d154b754 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -39,6 +39,7 @@ config CPU_SPECIFIC_OPTIONS
select INTEL_GMA_OPREGION_2_1
select IOAPIC
select MICROCODE_BLOB_UNDISCLOSED
+ select MP_SERVICES_PPI_V2
select MRC_SETTINGS_PROTECT
select PARALLEL_MP_AP_WORK
select PLATFORM_USES_FSP2_3
@@ -345,31 +346,6 @@ config SOC_INTEL_GFX_FRAMEBUFFER_OFFSET
hex
default 0x800000
-choice
- prompt "Multiprocessor (MP) Initialization configuration to use"
- default MTL_USE_FSP_MP_INIT
-
-config MTL_USE_FSP_MP_INIT
- bool "Use FSP MP init"
- select MP_SERVICES_PPI_V2
- help
- Upon selection, coreboot brings APs from reset and the FSP runs feature programming.
-
-config MTL_USE_COREBOOT_MP_INIT
- bool "Use coreboot MP init"
- # FSP assumes ownership of the APs (Application Processors)
- # upon passing `NULL` pointer to the CpuMpPpi FSP-S UPD.
- # Hence, select `MP_SERVICES_PPI_V2_NOOP` config to pass a valid
- # pointer to the CpuMpPpi UPD with FSP_UNSUPPORTED type APIs.
- # This will protect APs from getting hijacked by FSP while coreboot
- # decides to set SkipMpInit UPD.
- select MP_SERVICES_PPI_V2_NOOP
- select RELOAD_MICROCODE_PATCH
- help
- Upon selection, coreboot performs MP Initialization that includes feature programming.
-
-endchoice
-
config FSP_PUBLISH_MBP_HOB
bool
default n if CHROMEOS
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c
index fae9cbb1b1..041429dcc4 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -389,7 +389,7 @@ static void fill_fsps_cpu_params(FSP_S_CONFIG *s_cfg,
* Fill `2nd microcode loading FSP UPD` if FSP is running CPU feature
* programming.
*/
- if (CONFIG(MTL_USE_FSP_MP_INIT))
+ if (CONFIG(USE_FSP_FEATURE_PROGRAM_ON_APS))
fill_fsps_microcode_params(s_cfg, config);
}