diff options
| author | Mario Scheithauer <mario.scheithauer@siemens.com> | 2023-01-25 14:27:38 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-03-02 16:14:59 +0000 |
| commit | ba8c80cb56790cf184c107a5f3a6b2fd2d0015d8 (patch) | |
| tree | 0a265d9a6336bd8c6037946ad29f489e0175fe80 /src | |
| parent | 7f1f8302fd10bbd87920463a8ce871da11b09477 (diff) | |
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 <mario.scheithauer@siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72428
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src')
5 files changed, 16 insertions, 4 deletions
diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig index 74b8929181..4fd6c1a2c4 100644 --- a/src/mainboard/siemens/mc_ehl/Kconfig +++ b/src/mainboard/siemens/mc_ehl/Kconfig @@ -6,10 +6,6 @@ config BOARD_SIEMENS_BASEBOARD_MC_EHL 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 4ba5a752c9..5d382bdf97 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 @@ config BOARD_SPECIFIC_OPTIONS 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 9e3e9dccb3..90e0449799 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 @@ config BOARD_SPECIFIC_OPTIONS 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 3089611ff4..144e9d5db3 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 @@ config BOARD_SPECIFIC_OPTIONS 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 ee725cc71b..9ea2fe84f9 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 @@ config BOARD_SPECIFIC_OPTIONS 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" |