diff options
| -rw-r--r-- | src/drivers/intel/fsp2_0/silicon_init.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/meteorlake/fsp_params.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 89b8a1b2a2..cea894c245 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -77,7 +77,7 @@ bool fsp_is_multi_phase_init_enabled(void) static void fsp_fill_common_arch_params(FSPS_UPD *supd) { -#if CONFIG(FSPS_HAS_ARCH_UPD) +#if (CONFIG(FSPS_HAS_ARCH_UPD) && !CONFIG(PLATFORM_USES_FSP2_4)) FSPS_ARCHx_UPD *s_arch_cfg = &supd->FspsArchUpd; s_arch_cfg->EnableMultiPhaseSiliconInit = fsp_is_multi_phase_init_enabled(); #endif diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index 0ac3b48e75..36412b7d88 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -705,10 +705,13 @@ static void fill_fsps_irq_params(FSP_S_CONFIG *s_cfg, static void arch_silicon_init_params(FSPS_ARCHx_UPD *s_arch_cfg) { + +#if !CONFIG(PLATFORM_USES_FSP2_4) /* * EnableMultiPhaseSiliconInit for running MultiPhaseSiInit */ s_arch_cfg->EnableMultiPhaseSiliconInit = 1; +#endif /* Assign FspEventHandler arch Upd to use coreboot debug event handler */ if (CONFIG(FSP_USES_CB_DEBUG_EVENT_HANDLER) && CONFIG(CONSOLE_SERIAL) && |