[coreboot-gerrit] [S] Change in coreboot[main]: move UGOP_ESOL config to FSP

[Jayvik Desai (Code Review)]

Jayvik Desai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83769?usp=email )

Change subject: move UGOP_ESOL config to FSP
......................................................................

move UGOP_ESOL config to FSP

This patch moves the Metorlake early sign of life config out of the
SOC-specific config and into the FSP driver config.

BUG=NA
TEST=Able to build google/rex and checked the config in output.

Change-Id: Ib4589f52080229b1c83915b51272a042b7ac32cd
Signed-off-by: Jayvik Desai 
---
M src/drivers/intel/fsp2_0/Kconfig
M src/soc/intel/meteorlake/Kconfig
M src/soc/intel/meteorlake/romstage/fsp_params.c
3 files changed, 12 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/83769/1

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 9ea1526..715d7ed 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -457,6 +457,15 @@
      This option allows to create `Debug Event Handler` to print FSP debug messages
      to output device using coreboot native implementation.

+config FSP_UGOP_EARLY_SIGN_OF_LIFE
+	bool
+	default n
+	help
+	  Enable the FSP-M Sign-of-Life feature to display a
+	  configurable text message on screen during memory training
+	  and CSME update.
+
+
 config DISPLAY_FSP_TIMESTAMPS
    bool "Display FSP Timestamps"
    default n
diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index ec8c318..274cabf 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -21,6 +21,8 @@
    select FSP_M_XIP
    select FSP_STATUS_GLOBAL_RESET_REQUIRED_3
    select FSP_USES_CB_DEBUG_EVENT_HANDLER
+	select FSP_UGOP_EARLY_SIGN_OF_LIFE if !SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
+	select VBT_CBFS_COMPRESSION_DEFAULT_LZ4 if FSP_UGOP_EARLY_SIGN_OF_LIFE
    select FSPS_HAS_ARCH_UPD
    select GENERIC_GPIO_LIB
    select HAVE_DEBUG_RAM_SETUP
@@ -457,16 +459,6 @@
    help
      slp_s0_residency granularity in 122us ticks (i.e. ~8.2KHz) in Meteor Lake.

-config SOC_INTEL_METEORLAKE_SIGN_OF_LIFE
-	bool
-	default y if !SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
-	depends on MAINBOARD_HAS_CHROMEOS
-	select VBT_CBFS_COMPRESSION_DEFAULT_LZ4
-	help
-	  Enable the FSP-M Sign-of-Life feature to display a
-	  configurable text message on screen during memory training
-	  and CSME update.
-
 config SOC_PHYSICAL_ADDRESS_WIDTH
    int
    default 42
diff --git a/src/soc/intel/meteorlake/romstage/fsp_params.c b/src/soc/intel/meteorlake/romstage/fsp_params.c
index ec78383..4018ee8 100644
--- a/src/soc/intel/meteorlake/romstage/fsp_params.c
+++ b/src/soc/intel/meteorlake/romstage/fsp_params.c
@@ -511,7 +511,7 @@

soc_memory_init_params(m_cfg, config);

-	if (CONFIG(SOC_INTEL_METEORLAKE_SIGN_OF_LIFE))
+	if (CONFIG(FSP_UGOP_EARLY_SIGN_OF_LIFE))
    	fill_fspm_sign_of_life(m_cfg, arch_upd);

mainboard_memory_init_params(mupd);