[coreboot-gerrit] Change in coreboot[master]: soc/intel/cnl: Add new Kconfig option which matches its FSPs name

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44952 )

Change subject: soc/intel/cnl: Add new Kconfig option which matches its FSPs name
......................................................................

soc/intel/cnl: Add new Kconfig option which matches its FSPs name

Since there are 4 different versions of FSPs for the Comet Lake
platform, add a new Kconfig option for the currently used SoC being able
to differ between the various SoCs and FSPs.

The new Kconfig option selects the Comet Lake SoC as base for taking
over its specific configuration and is only used for configuring the
path to its specific FSP header files and FSP binary.

Also, adjust all related mainboards so that their Kconfig selects the
new option.

For details, please see
https://github.com/intel/FSP/tree/master/CometLakeFspBinPkg

Built System76/lemp9 with BUILD_TIMELESS=1 before and after this patch
and both images are equal.

Change-Id: I44b717bb942fbcd359c7a06ef1a0ef4306697f64
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44952
Tested-by: build bot (Jenkins) 
Reviewed-by: Michael Niewöhner
---
M src/mainboard/google/drallion/Kconfig
M src/mainboard/google/hatch/Kconfig
M src/mainboard/intel/coffeelake_rvp/Kconfig.name
M src/mainboard/system76/lemp9/Kconfig
M src/soc/intel/cannonlake/Kconfig
5 files changed, 10 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index df67a8d..ae10b78 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -16,7 +16,7 @@
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_I2C_TPM_CR50
    select MAINBOARD_HAS_TPM2
-	select SOC_INTEL_COMETLAKE
+	select SOC_INTEL_COMETLAKE_1
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
    select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE
    select SYSTEM_TYPE_LAPTOP
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index ee9210d..690acd1 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -39,7 +39,7 @@
    select MAINBOARD_HAS_SPI_TPM_CR50
    select MAINBOARD_HAS_TPM2
    select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
-	select SOC_INTEL_COMETLAKE
+	select SOC_INTEL_COMETLAKE_1
    select SOC_INTEL_COMMON_BLOCK_DTT

if BOARD_GOOGLE_HATCH_COMMON
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig.name b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
index 519cd50..e03e862 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig.name
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig.name
@@ -14,4 +14,4 @@
    select SOC_INTEL_COFFEELAKE
 config BOARD_INTEL_COMETLAKE_RVPU
    bool "-> Cometlake U DDR4 RVP"
-	select SOC_INTEL_COMETLAKE
+	select SOC_INTEL_COMETLAKE_1
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index ef7c89a..6f2bee7 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -13,7 +13,7 @@
    select MAINBOARD_HAS_LPC_TPM
    select MAINBOARD_HAS_TPM2
    select NO_UART_ON_SUPERIO
-	select SOC_INTEL_COMETLAKE
+	select SOC_INTEL_COMETLAKE_1
    select SOC_INTEL_COMMON_BLOCK_HDA
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
    select SPD_READ_BY_WORD
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index d36e214..5b6295a 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -47,6 +47,10 @@
    help
      Intel Cometlake support

+config SOC_INTEL_COMETLAKE_1
+	bool
+	select SOC_INTEL_COMETLAKE
+
 config SOC_INTEL_CANNONLAKE_PCH_H
    bool
    help
@@ -313,12 +317,12 @@

config FSP_HEADER_PATH
    default "3rdparty/fsp/CoffeeLakeFspBinPkg/Include/" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE
-	default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/" if SOC_INTEL_COMETLAKE
+	default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/" if SOC_INTEL_COMETLAKE_1
    default "src/vendorcode/intel/fsp/fsp2_0/cannonlake/" if SOC_INTEL_CANNONLAKE

config FSP_FD_PATH
    default "3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE
-	default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd" if SOC_INTEL_COMETLAKE
+	default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd" if SOC_INTEL_COMETLAKE_1

config SOC_INTEL_CANNONLAKE_DEBUG_CONSENT
    int "Debug Consent for CNL"