Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55016 )
Change subject: Apply more uses for Kconfig TPM ......................................................................
Apply more uses for Kconfig TPM
Change-Id: I54b296563940cd46fe9da9fe789b746f2fc1987d Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/55016 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Julius Werner jwerner@chromium.org Reviewed-by: Paul Menzel paulepanter@mailbox.org --- M src/drivers/tpm/Kconfig M src/security/intel/txt/Kconfig M src/security/tpm/Kconfig M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 5 files changed, 7 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Aaron Durbin: Looks good to me, approved Julius Werner: Looks good to me, approved
diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig index 79b860f..735cfee 100644 --- a/src/drivers/tpm/Kconfig +++ b/src/drivers/tpm/Kconfig @@ -1,6 +1,6 @@ config TPM_INIT_RAMSTAGE bool - default y if TPM1 || TPM2 + default y if TPM depends on !VBOOT && !VENDORCODE_ELTAN_VBOOT && !VENDORCODE_ELTAN_MBOOT \ && !TPM_MEASURED_BOOT_INIT_BOOTBLOCK help @@ -9,7 +9,7 @@
config TPM_PPI bool "Generate ACPI code to implement TPM physical presence interface" - depends on TPM1 || TPM2 + depends on TPM depends on HAVE_ACPI_TABLES depends on !CHROMEOS default y if PAYLOAD_TIANOCORE diff --git a/src/security/intel/txt/Kconfig b/src/security/intel/txt/Kconfig index 14b4f6a..3648925 100644 --- a/src/security/intel/txt/Kconfig +++ b/src/security/intel/txt/Kconfig @@ -7,7 +7,7 @@ select ENABLE_VMX if CPU_INTEL_COMMON select AP_IN_SIPI_WAIT select TPM_MEASURED_BOOT_INIT_BOOTBLOCK if TPM_MEASURED_BOOT - depends on (TPM1 || TPM2) + depends on TPM depends on CPU_INTEL_FIRMWARE_INTERFACE_TABLE depends on PLATFORM_HAS_DRAM_CLEAR depends on (SOC_INTEL_COMMON_BLOCK_SA || HAVE_CF9_RESET) diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig index e228a3d..4864f12 100644 --- a/src/security/tpm/Kconfig +++ b/src/security/tpm/Kconfig @@ -70,7 +70,7 @@ bool "Output verbose TPM debug messages" default n select DRIVER_TPM_DISPLAY_TIS_BYTES if I2C_TPM - depends on TPM1 || TPM2 + depends on TPM help This option enables additional TPM related debug messages.
@@ -96,7 +96,7 @@ bool "Enable Measured Boot" default n select VBOOT_LIB - depends on TPM1 || TPM2 + depends on TPM depends on !VBOOT_RETURN_FROM_VERSTAGE help Enables measured boot (experimental) diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 515efc7..0368758 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -13,7 +13,7 @@ bool "Verify firmware with vboot." default n select VBOOT_LIB - select VBOOT_MOCK_SECDATA if !TPM1 && !TPM2 + select VBOOT_MOCK_SECDATA if !TPM depends on 0 = 0 # Must have a 'depends on' or board overrides will break it. help Enabling VBOOT will use vboot to verify the components of the firmware diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 668d3d9..47830f3 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -109,9 +109,7 @@ ramstage-y += secdata_tpm.c endif
-ifneq ($(CONFIG_TPM1)$(CONFIG_TPM2),) -verstage-y += tpm_common.c -endif +verstage-$(CONFIG_TPM) += tpm_common.c
romstage-y += common.c
-
Patrick Georgi (Code Review)