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>

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_INIT_RAMSTAGE
 
 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

src/security/intel/txt/Kconfig

@@ -7,7 +7,7 @@ config INTEL_TXT
 	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)

src/security/tpm/Kconfig

@@ -70,7 +70,7 @@ config DEBUG_TPM
 	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 @@ config TPM_MEASURED_BOOT
 	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)

src/security/vboot/Kconfig

@@ -13,7 +13,7 @@ config VBOOT
 	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

src/security/vboot/Makefile.inc

@@ -109,9 +109,7 @@ romstage-y += secdata_tpm.c
 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