[S] Change in coreboot[master]: mb/siemens/mc_ehl: Move TPM Kconfig switches to variants

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/72428 )

Change subject: mb/siemens/mc_ehl: Move TPM Kconfig switches to variants
......................................................................

mb/siemens/mc_ehl: Move TPM Kconfig switches to variants

The upcoming mc_ehl4 variant is the first Siemens Elkhart Lake mainboard
without a TPM. For this reason, the corresponding Kconfig switches must
be moved to variant level. To prevent Jenkins build from complaining,
the TPM is removed in the following patch.

Change-Id: Ic73ccd1b52e57c1cf1dd7337b0e28beaadbece8e
Signed-off-by: Mario Scheithauer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72428
Tested-by: build bot (Jenkins) 
Reviewed-by: Werner Zeh 
---
M src/mainboard/siemens/mc_ehl/Kconfig
M src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig
M src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig
M src/mainboard/siemens/mc_ehl/variants/mc_ehl3/Kconfig
M src/mainboard/siemens/mc_ehl/variants/mc_ehl4/Kconfig
5 files changed, 34 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Werner Zeh: Looks good to me, approved

diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig
index 74b8929..4fd6c1a 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/Kconfig
@@ -6,10 +6,6 @@
    select HAVE_ACPI_TABLES
    select DRIVER_SIEMENS_NC_FPGA
    select NC_FPGA_NOTIFY_CB_READY
-	select MAINBOARD_HAS_TPM2
-	select MEMORY_MAPPED_TPM
-	select TPM_MEASURED_BOOT
-	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK
    select USE_SIEMENS_HWILIB
    select SOC_INTEL_DISABLE_POWER_LIMITS

diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig
index 4ba5a75..5d382bd 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig
@@ -6,6 +6,10 @@
    select DRIVER_INTEL_I210
    select INTEL_LPSS_UART_FOR_CONSOLE
    select NC_FPGA_POST_CODE
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select TPM_MEASURED_BOOT
+	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK

config FMDFILE
    default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig
index 9e3e9dc..90e0449 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl2/Kconfig
@@ -7,6 +7,10 @@
    select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
    select EHL_TSN_DRIVER
    select DRIVERS_ETH_PHY_M88E1512
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select TPM_MEASURED_BOOT
+	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK

config FMDFILE
    default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/Kconfig
index 3089611..144e9d5 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/Kconfig
@@ -8,6 +8,10 @@
    select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
    select EHL_TSN_DRIVER
    select DRIVERS_ETH_PHY_M88E1512
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select TPM_MEASURED_BOOT
+	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK

config FMDFILE
    default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/Kconfig
index ee725cc..9ea2fe8 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl4/Kconfig
@@ -6,6 +6,10 @@
    select DRIVER_INTEL_I210
    select INTEL_LPSS_UART_FOR_CONSOLE
    select NC_FPGA_POST_CODE
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select TPM_MEASURED_BOOT
+	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK

config FMDFILE
    default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"