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>
This commit is contained in:
Mario Scheithauer 2023-01-25 14:27:38 +01:00 committed by Felix Held
parent 7f1f8302fd
commit ba8c80cb56
5 changed files with 16 additions and 4 deletions

View File

@ -6,10 +6,6 @@ config BOARD_SIEMENS_BASEBOARD_MC_EHL
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select DRIVER_SIEMENS_NC_FPGA select DRIVER_SIEMENS_NC_FPGA
select NC_FPGA_NOTIFY_CB_READY 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 USE_SIEMENS_HWILIB
select SOC_INTEL_DISABLE_POWER_LIMITS select SOC_INTEL_DISABLE_POWER_LIMITS

View File

@ -6,6 +6,10 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVER_INTEL_I210 select DRIVER_INTEL_I210
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select NC_FPGA_POST_CODE 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 config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"

View File

@ -7,6 +7,10 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
select EHL_TSN_DRIVER select EHL_TSN_DRIVER
select DRIVERS_ETH_PHY_M88E1512 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 config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"

View File

@ -8,6 +8,10 @@ config BOARD_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
select EHL_TSN_DRIVER select EHL_TSN_DRIVER
select DRIVERS_ETH_PHY_M88E1512 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 config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"

View File

@ -6,6 +6,10 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVER_INTEL_I210 select DRIVER_INTEL_I210
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select NC_FPGA_POST_CODE 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 config FMDFILE
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd"