[XS] Change in coreboot[main]: soc/intel/meteorlake: Exclude deprecated upd from FSP2.4 builds

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/82699?usp=email )

Change subject: soc/intel/meteorlake: Exclude deprecated upd from FSP2.4 builds
......................................................................

soc/intel/meteorlake: Exclude deprecated upd from FSP2.4 builds

EnableMultiPhaseSiliconInit upd is deprecated and has been
removed starting with v2.4 of FSP specification. Multi-phase
silicon initialization is mandatory for all FSP implementations
compliant to v2.4.

The following modifications are made:
- In fsp_params.c and silicon_init.c EnableMultiPhaseSiliconInit
  update is guarded so that it will get included only if FSP2.4
  is not selected.

BUG=b:329034258
TEST=Verified x86_32 and x86_64 builds on Meteor Lake board (Rex)

Change-Id: Icdbf3bacc0a05975fc941b264fd400d74f506fce
Signed-off-by: Appukuttan V K 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82699
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
Reviewed-by: Dinesh Gehlot 
Reviewed-by: Kapil Porwal 
---
M src/drivers/intel/fsp2_0/silicon_init.c
M src/soc/intel/meteorlake/fsp_params.c
2 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Subrata Banik: Looks good to me, approved
  Dinesh Gehlot: Looks good to me, approved
  build bot (Jenkins): Verified
  Kapil Porwal: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 89b8a1b..cea894c 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -77,7 +77,7 @@

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 0ac3b48..36412b7 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -705,10 +705,13 @@

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) &&