tpm: Refactor TPM Kconfig dimensions

Break TPM related Kconfig into the following dimensions:

TPM transport support:
config CRB_TPM
config I2C_TPM
config SPI_TPM
config MEMORY_MAPPED_TPM (new)

TPM brand, not defining any of these is valid, and result in "generic" support:
config TPM_ATMEL (new)
config TPM_GOOGLE (new)
config TPM_GOOGLE_CR50 (new, implies TPM_GOOGLE)
config TPM_GOOGLE_TI50 (new to be used later, implies TPM_GOOGLE)

What protocol the TPM chip supports:
config MAINBOARD_HAS_TPM1
config MAINBOARD_HAS_TPM2

What the user chooses to compile (restricted by the above):
config NO_TPM
config TPM1
config TPM2

The following Kconfigs will be replaced as indicated:
config TPM_CR50 -> TPM_GOOGLE
config MAINBOARD_HAS_CRB_TPM -> CRB_TPM
config MAINBOARD_HAS_I2C_TPM_ATMEL -> I2C_TPM && TPM_ATMEL
config MAINBOARD_HAS_I2C_TPM_CR50 -> I2C_TPM && TPM_GOOGLE
config MAINBOARD_HAS_I2C_TPM_GENERIC -> I2C_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_LPC_TPM -> MEMORY_MAPPED_TPM
config MAINBOARD_HAS_SPI_TPM -> SPI_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_SPI_TPM_CR50 -> SPI_TPM && TPM_GOOGLE

Signed-off-by: Jes B. Klinke <jbk@chromium.org>
Change-Id: I4656b2b90363b8dfd008dc281ad591862fe2cc9e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

51 files changed, 92 insertions, 68 deletions

diff --git a/src/mainboard/google/asurada/Kconfig b/src/mainboard/google/asurada/Kconfig
index 7d757eb0a7..46a0327e4f 100644
--- a/src/mainboard/google/asurada/Kconfig
+++ b/src/mainboard/google/asurada/Kconfig
@@ -23,7 +23,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_SPI
-	select MAINBOARD_HAS_SPI_TPM_CR50 if VBOOT
+	select SPI_TPM if VBOOT
+	select TPM_GOOGLE_CR50 if VBOOT
 	select MAINBOARD_HAS_TPM2 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 7c9b8642b8..6f0ff89b09 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -10,7 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_AURON
 	select INTEL_INT15
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_BROADWELL
 
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index 74caad259f..5afb3ea144 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -8,7 +8,7 @@ config BOARD_GOOGLE_BASEBOARD_BELTINO
 	select INTEL_LYNXPOINT_LP
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 724da6ca40..1a3cb559cc 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -28,15 +28,16 @@ config BOARD_GOOGLE_BRYA_COMMON
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select I2C_TPM
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select PMC_IPC_ACPI_INTERFACE
 	select SOC_INTEL_COMMON_BLOCK_PCIE_RTD3
 	select SOC_INTEL_CSE_LITE_SKU
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES if SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_COMMON_BASECODE_DEBUG_FEATURE
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_BASEBOARD_BRYA
 	def_bool n
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index f8897ac471..49ac7d2ae1 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/cherry/Kconfig b/src/mainboard/google/cherry/Kconfig
index 206c4e41f0..2816f9ba89 100644
--- a/src/mainboard/google/cherry/Kconfig
+++ b/src/mainboard/google/cherry/Kconfig
@@ -24,7 +24,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_SKUID
 	select EC_GOOGLE_CHROMEEC_SPI
-	select MAINBOARD_HAS_I2C_TPM_CR50 if VBOOT
+	select I2C_TPM if VBOOT
+	select TPM_GOOGLE_CR50 if VBOOT
 	select MAINBOARD_HAS_TPM2 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig
index 7bf557fd2c..436ea94a7e 100644
--- a/src/mainboard/google/corsola/Kconfig
+++ b/src/mainboard/google/corsola/Kconfig
@@ -33,7 +33,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_SKUID
 	select EC_GOOGLE_CHROMEEC_SPI
-	select MAINBOARD_HAS_SPI_TPM_CR50 if VBOOT
+	select SPI_TPM if VBOOT
+	select TPM_GOOGLE_CR50 if VBOOT
 	select MAINBOARD_HAS_TPM2 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index c3032668cf..ac679c765f 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -12,7 +12,7 @@ config BOARD_GOOGLE_BASEBOARD_CYAN
 	select HAVE_SPD_IN_CBFS
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN
 	select SOC_INTEL_BRASWELL
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index 56970227fe..d4117d84ac 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 458dfc7f43..68b87576f5 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -37,12 +37,13 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE
 config BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	def_bool n
 	select CR50_USE_LONG_INTERRUPT_PULSES
-	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SPI_TPM
+	select TPM_GOOGLE_CR50
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE
 
 config BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	def_bool n
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE
 
 if BOARD_GOOGLE_BASEBOARD_DEDEDE
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig
index 7dc4286dc9..f0267fd633 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -9,14 +9,15 @@ config BOARD_GOOGLE_BASEBOARD_DELTAUR
 	select EC_GOOGLE_WILCO
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select I2C_TPM
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select SOC_INTEL_TIGERLAKE
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_DELTAN
 	select BOARD_GOOGLE_BASEBOARD_DELTAUR
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index a26e70e978..40afdf4851 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -12,9 +12,9 @@ config BOARD_GOOGLE_BASEBOARD_DRALLION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_SPD_IN_CBFS
+	select I2C_TPM
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
 	select SMBIOS_SERIAL_FROM_VPD if VPD
@@ -22,6 +22,7 @@ config BOARD_GOOGLE_BASEBOARD_DRALLION
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_DRALLION
 	select BOARD_GOOGLE_BASEBOARD_DRALLION
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index 5e1b2f7ea5..0579c0dfe1 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -14,14 +14,15 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC_ESPI
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_KABYLAKE
 	select SYSTEM_TYPE_CONVERTIBLE
+	select TPM_GOOGLE_CR50
 	select HAVE_SPD_IN_CBFS
 
 config DISABLE_HECI1_AT_PRE_BOOT
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 01d838a903..92c6abf05e 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -14,14 +14,15 @@ config BOARD_GOOGLE_BASEBOARD_FIZZ
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select NO_FADT_8042
 	select SOC_INTEL_KABYLAKE
 	select SPD_READ_BY_WORD
+	select SPI_TPM
 	select RT8168_GET_MAC_FROM_VPD
 	select RT8168_SUPPORT_LEGACY_VPD_MAC
 	select RT8168_SET_LED_MODE
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_FIZZ
 	select BOARD_GOOGLE_BASEBOARD_FIZZ
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index c6b00381b0..6a2d28ef06 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOOTROM_SDRAM_INIT # use BootRom to config sdram
 	select COMMON_CBFS_SPI_WRAPPER
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index bd2092b378..76ecb6541e 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH_STMICRO
 	select SPI_FLASH_WINBOND
 	select DRIVERS_UART
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 59ea8eda0e..ff6b1ea862 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -16,7 +16,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_SKYLAKE
 	select SYSTEM_TYPE_LAPTOP
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 3c756cfd2f..23926b65d9 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -43,8 +43,9 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_SPI_TPM_CR50 if GRU_HAS_TPM2
-	select MAINBOARD_HAS_I2C_TPM_GENERIC if !GRU_HAS_TPM2
+	select I2C_TPM if !GRU_HAS_TPM2
+	select TPM_GOOGLE_CR50 if GRU_HAS_TPM2
+	select SPI_TPM if GRU_HAS_TPM2
 	select MAINBOARD_HAS_TPM1 if !GRU_HAS_TPM2
 	select MAINBOARD_HAS_TPM2 if GRU_HAS_TPM2
 
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index b082e25b31..a19cfe8ace 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -33,8 +33,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_EM100_SUPPORT
 	select HAVE_SPD_IN_CBFS
+	select I2C_TPM
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_ASPM
 	select PCIEXP_CLK_PM
@@ -47,6 +47,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_I2C3_TPM_SHARED_WITH_PSP
 	select SOC_AMD_COMMON_BLOCK_USE_ESPI
 	select SOC_AMD_COMMON_BLOCK_PSP_FUSE_SPL
+	select TPM_GOOGLE_CR50
 
 config CHROMEOS
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index ad23f05c4c..749b0df30a 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -19,11 +19,12 @@ config BOARD_GOOGLE_HATCH_COMMON
 	select HAVE_ACPI_TABLES
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
 	select SOC_INTEL_COMETLAKE_1
 	select SOC_INTEL_COMMON_BLOCK_DTT
+	select SPI_TPM
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_BASEBOARD_HATCH
 	def_bool n
diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
index bf66bbc46f..7c2673dbf9 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -25,9 +25,10 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_MACRONIX
 	select SPI_FLASH_WINBOND
+	select TPM_GOOGLE_CR50 if !BOARD_GOOGLE_SENOR
+	select SPI_TPM if BOARD_GOOGLE_PIGLIN
+	select I2C_TPM if !BOARD_GOOGLE_PIGLIN && !BOARD_GOOGLE_SENOR
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_SPI_TPM_CR50 if BOARD_GOOGLE_PIGLIN
-	select MAINBOARD_HAS_I2C_TPM_CR50 if !BOARD_GOOGLE_PIGLIN && !BOARD_GOOGLE_SENOR
 	select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_SENOR
 
 config VBOOT
@@ -57,7 +58,7 @@ config MAINBOARD_PART_NUMBER
 	default "Villager" if BOARD_GOOGLE_VILLAGER
 
 config DRIVER_TPM_I2C_BUS
-	depends on MAINBOARD_HAS_I2C_TPM_CR50
+	depends on I2C_TPM
 	hex
 	default 0xC if BOARD_GOOGLE_HEROBRINE_REV0
 	default 0xE
@@ -66,7 +67,7 @@ config DRIVER_TPM_I2C_ADDR
 	default 0x50
 
 config DRIVER_TPM_SPI_BUS
-	depends on MAINBOARD_HAS_SPI_TPM_CR50
+	depends on SPI_TPM
 	hex
 	default 0xE
 
diff --git a/src/mainboard/google/herobrine/bootblock.c b/src/mainboard/google/herobrine/bootblock.c
index 50ca0aa4e0..cd1612703f 100644
--- a/src/mainboard/google/herobrine/bootblock.c
+++ b/src/mainboard/google/herobrine/bootblock.c
@@ -10,10 +10,10 @@ void bootblock_mainboard_init(void)
 {
 	setup_chromeos_gpios();
 
-	if (CONFIG(MAINBOARD_HAS_I2C_TPM_CR50))
+	if (CONFIG(I2C_TPM))
 		i2c_init(CONFIG_DRIVER_TPM_I2C_BUS, I2C_SPEED_FAST); /* H1/TPM I2C */
 
-	if (CONFIG(MAINBOARD_HAS_SPI_TPM_CR50))
+	if (CONFIG(SPI_TPM))
 		qup_spi_init(CONFIG_DRIVER_TPM_SPI_BUS, 1010 * KHz); /* H1/TPM SPI */
 
 	if (CONFIG(EC_GOOGLE_CHROMEEC))
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 836cbdf4e9..584b88b294 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -7,7 +7,7 @@ config BOARD_GOOGLE_BASEBOARD_JECHT
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_BROADWELL
 	select SUPERIO_ITE_IT8772F
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index c82a20e18c..10524fe5e9 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -15,6 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select EC_GOOGLE_CHROMEEC_LPC
 	select HAVE_ACPI_TABLES
 	select HAVE_SPD_IN_CBFS
+	select I2C_TPM
 	select GFXUMA
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select MAINBOARD_HAS_CHROMEOS
@@ -23,7 +24,6 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select SOC_AMD_SMU_FANLESS
 	select HAVE_ACPI_RESUME
 	select DRIVERS_GENERIC_BH720
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select DRIVERS_GENERIC_ADAU7002
 	select DRIVERS_GENERIC_MAX98357A
@@ -34,6 +34,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select PCIEXP_L1_SUB_STATE
 	select HAVE_EM100_SUPPORT
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
 
 if BOARD_GOOGLE_BASEBOARD_KAHLEE
 
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index a1614ed2aa..45682494ff 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -31,7 +31,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_SPI
-	select MAINBOARD_HAS_SPI_TPM_CR50 if VBOOT
+	select SPI_TPM if VBOOT
+	select TPM_GOOGLE_CR50 if VBOOT
 	select MAINBOARD_HAS_TPM2 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index e08ced97e2..e6e4b0bff1 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_SPD_IN_CBFS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index f3506143b7..5c253c9bc9 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_AS3722_RTC
 
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index c16736a115..e687129617 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_AS3722_RTC
 
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 6302b85483..03535e95e5 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVER_PARADE_PS8640
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_SPI
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 8bcd826fc5..3bdc63b60f 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -19,14 +19,15 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select HAVE_ACPI_TABLES
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select NO_BOOTBLOCK_CONSOLE
 	select NO_CBFS_MCACHE
 	select NO_FMAP_CACHE
 	select SOC_ESPI
 	select SOC_INTEL_GEMINILAKE
+	select SPI_TPM
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_AMPTON
 	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index c06da09dd4..dd6df3ea13 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index 329f949726..497ada1968 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select HAVE_LINEAR_FRAMEBUFFER
 	select DRIVER_PARADE_PS8625
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 	select MISSING_BOARD_RESET
 
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 4032f57d01..3007bcbc9a 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -14,6 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_KABYLAKE
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_ATLAS
 	select BOARD_GOOGLE_BASEBOARD_POPPY
@@ -26,14 +27,14 @@ config BOARD_GOOGLE_ATLAS
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SPI_TPM
 	select SYSTEM_TYPE_LAPTOP
 	select VARIANT_HAS_CAMERA_ACPI
 
 config BOARD_GOOGLE_POPPY
 	select BOARD_GOOGLE_BASEBOARD_POPPY
 	select DRIVERS_I2C_MAX98927
-	select MAINBOARD_HAS_I2C_TPM_CR50
+	select I2C_TPM
 	select NO_FADT_8042
 	select SYSTEM_TYPE_LAPTOP
 	select VARIANT_HAS_CAMERA_ACPI
@@ -46,7 +47,7 @@ config BOARD_GOOGLE_NAMI
 	select DRIVERS_SPI_ACPI
 	select EXCLUDE_NATIVE_SD_INTERFACE
 	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SPI_TPM
 	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_NAUTILUS
@@ -54,8 +55,8 @@ config BOARD_GOOGLE_NAUTILUS
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_DA7219
+	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select SYSTEM_TYPE_CONVERTIBLE
 	select VARIANT_HAS_CAMERA_ACPI
 
@@ -70,8 +71,8 @@ config BOARD_GOOGLE_NOCTURNE
 	select EXCLUDE_NATIVE_SD_INTERFACE
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select NO_FADT_8042
+	select SPI_TPM
 	select SYSTEM_TYPE_DETACHABLE
 	select VARIANT_HAS_CAMERA_ACPI
 
@@ -84,14 +85,14 @@ config BOARD_GOOGLE_RAMMUS
 	select DRIVERS_USB_ACPI
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SPI_TPM
 	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_SORAKA
 	select BOARD_GOOGLE_BASEBOARD_POPPY
 	select DRIVERS_I2C_MAX98927
+	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select NO_FADT_8042
 	select SYSTEM_TYPE_DETACHABLE
 	select VARIANT_HAS_CAMERA_ACPI
@@ -118,15 +119,15 @@ config DEVICETREE
 	default "variants/baseboard/devicetree.cb"
 
 config DRIVER_TPM_I2C_BUS
-	depends on MAINBOARD_HAS_I2C_TPM_CR50
+	depends on I2C_TPM
 	default 0x1
 
 config DRIVER_TPM_I2C_ADDR
-	depends on MAINBOARD_HAS_I2C_TPM_CR50
+	depends on I2C_TPM
 	default 0x50
 
 config DRIVER_TPM_SPI_BUS
-	depends on MAINBOARD_HAS_SPI_TPM_CR50
+	depends on SPI_TPM
 	default 0x1
 
 config INCLUDE_NHLT_BLOBS
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index ad113f5409..f8af00f6b1 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -9,7 +9,7 @@ config BOARD_GOOGLE_BASEBOARD_RAMBI
 	select HAVE_OPTION_TABLE
 	select HAVE_SPD_IN_CBFS
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_BAYTRAIL
 
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 0ab463e22d..47d111431d 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -12,14 +12,15 @@ config BOARD_GOOGLE_BASEBOARD_REEF
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select SAR_ENABLE
 	select SOC_INTEL_APOLLOLAKE
 	select SYSTEM_TYPE_LAPTOP
+	select TPM_GOOGLE_CR50
 	select USE_SAR
 
 config BOARD_GOOGLE_REEF
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 32a253e13a..37c72ad663 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -10,10 +10,10 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_EC_REGION
 	select SAR_ENABLE
@@ -22,6 +22,7 @@ config BOARD_GOOGLE_BASEBOARD_SARIEN
 	select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE
 	select SOC_INTEL_WHISKEYLAKE
 	select SPD_READ_BY_WORD
+	select TPM_GOOGLE_CR50
 	select USE_SAR
 
 config BOARD_GOOGLE_ARCADA
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 0f5469db1c..5a60c987b6 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -24,12 +24,13 @@ config BOARD_SPECIFIC_OPTIONS
 	select ELOG
 	select ELOG_GSMI
 	select FW_CONFIG
+	select I2C_TPM
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select PSP_DISABLE_POSTCODES   # TODO re-enable PSP postcodes later (b/227199049)
 	select SOC_AMD_SABRINA
 	select SOC_AMD_COMMON_BLOCK_USE_ESPI
+	select TPM_GOOGLE_CR50
 
 config CHROMEOS
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 0148093a9a..437797ce03 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -12,7 +12,7 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY
 	select INTEL_LYNXPOINT_LP
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 48172d4eae..e57da4afd2 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_I2C
 	select EC_GOOGLE_CHROMEEC_I2C_PROTO3
+	select I2C_TPM
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
 	select SPI_FLASH
@@ -16,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_NVIDIA_TEGRA210
 	select MAINBOARD_DO_DSI_INIT
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_TI_TPS65913_RTC
 
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 435011f279..c5ce74b49b 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH_SPANSION
 	select SPI_FLASH_STMICRO
 	select DRIVERS_UART
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index d26d5b94a6..152c57fc2d 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index 29b039551e..e409aeee67 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -44,8 +44,9 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_BUBS
 	select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_BUBS
+	select SPI_TPM if !BOARD_GOOGLE_BUBS
+	select TPM_GOOGLE_CR50 if !BOARD_GOOGLE_BUBS
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES if !BOARD_GOOGLE_BUBS
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 83f6eb2d2b..0847c410ff 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index eaeb8f430a..2c4696555a 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 77c06dccd5..916d8a65d9 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select SPI_FLASH_GIGADEVICE
 	select SPI_FLASH_WINBOND
-	select MAINBOARD_HAS_I2C_TPM_GENERIC
+	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
 
 config VBOOT
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 28d345729d..682d247300 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -29,12 +29,14 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select HAVE_SPD_IN_CBFS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50 if BOARD_GOOGLE_VOLTEER2_TI50
-	select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_VOLTEER2_TI50
+	select I2C_TPM if BOARD_GOOGLE_VOLTEER2_TI50
+	select SPI_TPM if !BOARD_GOOGLE_VOLTEER2_TI50
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_COMMON_BLOCK_TCSS
 	select SOC_INTEL_CSE_LITE_SKU
 	select SOC_INTEL_TIGERLAKE
+	select TPM_GOOGLE_TI50 if BOARD_GOOGLE_VOLTEER2_TI50
+	select TPM_GOOGLE_CR50 if !BOARD_GOOGLE_VOLTEER2_TI50
 
 config BOARD_GOOGLE_DELBIN
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 7089dddc02..91fe319b92 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -84,7 +84,7 @@ static void mainboard_enable(struct device *dev)
 void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *cfg)
 {
 	int ret;
-	if (!CONFIG(MAINBOARD_HAS_SPI_TPM_CR50)) {
+	if (!CONFIG(TPM_GOOGLE_CR50) || !CONFIG(SPI_TPM)) {
 		/*
 		 * Negotiation of long interrupt pulses is only supported via SPI.  I2C is only
 		 * used on reworked prototypes on which the TPM is replaced with Dauntless under
diff --git a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
index b69990c24a..763a5ee893 100644
--- a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb
@@ -29,7 +29,7 @@ chip soc/intel/tigerlake
 	register "common_soc_config" = "{
 		.gspi[0] = {
 			.speed_mhz = 1,
-			.early_init = CONFIG(MAINBOARD_HAS_SPI_TPM_CR50),
+			.early_init = CONFIG(SPI_TPM),
 		},
 		.i2c[0] = {
 			.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
index d024835aa0..b6657a1576 100644
--- a/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer2/overridetree.cb
@@ -22,14 +22,14 @@ chip soc/intel/tigerlake
 	register "common_soc_config" = "{
 		.gspi[0] = {
 			.speed_mhz = 1,
-			.early_init = CONFIG(MAINBOARD_HAS_SPI_TPM_CR50),
+			.early_init = CONFIG(SPI_TPM),
 		},
 		.i2c[0] = {
 			.speed = I2C_SPEED_FAST,
 		},
 		.i2c[1] = {
 			.speed = I2C_SPEED_FAST,
-			.early_init = CONFIG(MAINBOARD_HAS_I2C_TPM_CR50),
+			.early_init = CONFIG(I2C_TPM),
 		},
 		.i2c[2] = {
 			.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/volteer/variants/volteer2/variant.c b/src/mainboard/google/volteer/variants/volteer2/variant.c
index 442402779d..c9129b242d 100644
--- a/src/mainboard/google/volteer/variants/volteer2/variant.c
+++ b/src/mainboard/google/volteer/variants/volteer2/variant.c
@@ -20,6 +20,6 @@ static void devtree_enable_i2c_tpm(void)
 
 void variant_devtree_update(void)
 {
-	if (CONFIG(MAINBOARD_HAS_I2C_TPM_CR50))
+	if (CONFIG(I2C_TPM))
 		devtree_enable_i2c_tpm();
 }
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 6d66b1a706..0e04706024 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -37,7 +37,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select MAINBOARD_HAS_CHROMEOS
 	select AMD_SOC_CONSOLE_UART
-	select MAINBOARD_HAS_I2C_TPM_CR50
+	select I2C_TPM
+	select TPM_GOOGLE_CR50
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_ASPM
 	select PCIEXP_CLK_PM