[coreboot-gerrit] [XS] Change in coreboot[main]: Revert "soc/intel/adl: Guard TWL SoC missing UPDs for build integrity"

[Subrata Banik (Code Review)]

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

Change subject: Revert "soc/intel/adl: Guard TWL SoC missing UPDs for build integrity"
......................................................................

Revert "soc/intel/adl: Guard TWL SoC missing UPDs for build integrity"

This reverts commit 59ee65d271c7c617bcc240019231da4f0bd04db6.

Reason for revert:
- Usb4CmMode & CnviWifiCore Upds are available starting with TWL FSP
  version v5222.01. Therefore, no special handling is required.

BUG=b:330654700
TEST=Able to build google/tivviks.

Change-Id: I3c74ec5b9924e88a26984fe8d3275ba80edb14ab
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83658
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: V Sowmya 
---
M src/soc/intel/alderlake/fsp_params.c
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  V Sowmya: Looks good to me, approved
  build bot (Jenkins): Verified
  Eric Lai: Looks good to me, approved

diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index d7b30c6..2cbf796 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -683,9 +683,7 @@
    		s_cfg->UsbTcPortEn |= BIT(i);
    }

-#if !CONFIG(SOC_INTEL_TWINLAKE)
    s_cfg->Usb4CmMode = CONFIG(SOFTWARE_CONNECTION_MANAGER);
-#endif
 }

static void fill_fsps_chipset_lockdown_params(FSP_S_CONFIG *s_cfg,
@@ -833,9 +831,7 @@
    	const struct soc_intel_alderlake_config *config)
 {
    /* CNVi */
-#if !CONFIG(SOC_INTEL_TWINLAKE)
    s_cfg->CnviWifiCore = is_devfn_enabled(PCH_DEVFN_CNVI_WIFI);
-#endif
    s_cfg->CnviMode = is_devfn_enabled(PCH_DEVFN_CNVI_WIFI);
    s_cfg->CnviBtCore = config->cnvi_bt_core;
    s_cfg->CnviBtAudioOffload = config->cnvi_bt_audio_offload;