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>

Documentation/getting_started/kconfig.md

@@ -786,7 +786,7 @@ select <symbol> \[if <expr>\]
     config TPM
         bool
         default n
-        select LPC_TPM if ARCH_X86
+        select MEMORY_MAPPED_TPM if ARCH_X86
         select I2C_TPM if ARCH_ARM
         select I2C_TPM if ARCH_ARM64
         help

src/drivers/crb/Kconfig

@@ -1,17 +1,11 @@
 config CRB_TPM
 	bool
+	default n
 	help
-	  CRB TPM driver is enabled!
+	  Mainboard has Command Response Buffer support
 
 config CRB_TPM_BASE_ADDRESS
 	hex
 	default 0xfed40000
 	help
 	  Base Address of the CRB TPM Command Structure
-
-config MAINBOARD_HAS_CRB_TPM
-	bool
-	default n
-	select CRB_TPM
-	help
-	  Mainboard has Command Response Buffer support

src/drivers/crb/Makefile.inc

@@ -1,5 +1,3 @@
-bootblock-$(CONFIG_CRB_TPM) += tis.c tpm.c
+ifeq ($(CONFIG_CRB_TPM),y)
-verstage-$(CONFIG_CRB_TPM) += tis.c tpm.c
+all-y += tis.c tpm.c
-romstage-$(CONFIG_CRB_TPM) += tis.c tpm.c
+endif
-ramstage-$(CONFIG_CRB_TPM) += tis.c tpm.c
-postcar-$(CONFIG_CRB_TPM) += tis.c tpm.c

src/drivers/i2c/tpm/Kconfig

@@ -3,27 +3,6 @@ config I2C_TPM
 	help
 	  I2C TPM driver is enabled!
 
-config MAINBOARD_HAS_I2C_TPM_ATMEL
-	bool
-	default n
-	select I2C_TPM
-	help
-	  Board has an Atmel I2C TPM support
-
-config MAINBOARD_HAS_I2C_TPM_CR50
-	bool
-	default n
-	select I2C_TPM
-	help
-	  Board has a Cr50 I2C TPM support
-
-config MAINBOARD_HAS_I2C_TPM_GENERIC
-	bool
-	default n
-	select I2C_TPM
-	help
-	  Board has a generic I2C TPM support
-
 config MAINBOARD_NEEDS_I2C_TI50_WORKAROUND
 	bool
 	default n
@@ -36,7 +15,7 @@ config MAINBOARD_NEEDS_I2C_TI50_WORKAROUND
 config DRIVER_TIS_DEFAULT
 	bool
 	depends on I2C_TPM
-	default n if MAINBOARD_HAS_I2C_TPM_ATMEL
+	default n if TPM_ATMEL
 	default y
 
 config DRIVER_TPM_I2C_BUS
@@ -58,3 +37,9 @@ config DRIVER_TPM_DISPLAY_TIS_BYTES
 	bool "TPM: Display the TIS transactions to I2C TPM chip"
 	default n
 	depends on I2C_TPM
+
+config TPM_ATMEL
+	bool
+	default n
+	help
+	  The mainboard has an Atmel TPM chip.

src/drivers/i2c/tpm/Makefile.inc

@@ -1,25 +1,15 @@
-ramstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
+ifeq ($(CONFIG_TPM)$(CONFIG_I2C_TPM),yy)
-romstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
-verstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
-bootblock-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
-postcar-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
 
-ramstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c
+all-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c
-romstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c
-verstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c
-bootblock-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c
-postcar-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c
 
-ramstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC) += tpm.c
+ifeq ($(CONFIG_TPM_ATMEL),y)
-romstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC) += tpm.c
+all-y += tis_atmel.c
-verstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC) += tpm.c
+else ifeq ($(CONFIG_TPM_GOOGLE),y)
-bootblock-$(CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC) += tpm.c
+all-y += cr50.c
-postcar-$(CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC) += tpm.c
+else
+all-y += tpm.c
+endif
 
-ramstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_CR50) += cr50.c
+endif
-romstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_CR50) += cr50.c
-verstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_CR50) += cr50.c
-bootblock-$(CONFIG_MAINBOARD_HAS_I2C_TPM_CR50) += cr50.c
-postcar-$(CONFIG_MAINBOARD_HAS_I2C_TPM_CR50) += cr50.c
 
 ramstage-$(CONFIG_DRIVER_I2C_TPM_ACPI) += chip.c

src/drivers/pc80/tpm/Kconfig

@@ -1,10 +1,10 @@
-config MAINBOARD_HAS_LPC_TPM
+config MEMORY_MAPPED_TPM
 	bool
 	default n
 	help
-	  Board has LPC TPM support
+	  Board has memory mapped TPM support
 
-if MAINBOARD_HAS_LPC_TPM
+if MEMORY_MAPPED_TPM
 
 config TPM_TIS_BASE_ADDRESS
 	hex

src/drivers/pc80/tpm/Makefile.inc

@@ -1,5 +1,3 @@
-bootblock-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+ifeq ($(CONFIG_MEMORY_MAPPED_TPM),y)
-verstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+all-y += tis.c
-romstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+endif
-ramstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
-postcar-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c

src/drivers/spi/tpm/Kconfig

@@ -12,17 +12,3 @@ config DRIVER_TPM_SPI_CHIP
 	int "Chip Select of the TPM chip on its SPI bus"
 	default 0
 	depends on SPI_TPM
-
-config MAINBOARD_HAS_SPI_TPM_CR50
-	bool
-	default n
-	select MAINBOARD_HAS_SPI_TPM
-	help
-	  Board has a CR50 SPI TPM
-
-config MAINBOARD_HAS_SPI_TPM
-	bool
-	default n
-	select SPI_TPM
-	help
-	  Board has SPI TPM support

src/drivers/spi/tpm/Makefile.inc

@@ -1,5 +1,3 @@
-bootblock-$(CONFIG_SPI_TPM) += tis.c tpm.c
+ifeq ($(CONFIG_TPM)$(CONFIG_SPI_TPM),yy)
-verstage-$(CONFIG_SPI_TPM) += tis.c tpm.c
+all-y += tis.c tpm.c
-romstage-$(CONFIG_SPI_TPM) += tis.c tpm.c
+endif
-ramstage-$(CONFIG_SPI_TPM) += tis.c tpm.c
-postcar-$(CONFIG_SPI_TPM) += tis.c tpm.c

src/drivers/spi/tpm/tpm.c

@@ -104,7 +104,7 @@ static enum cb_err start_transaction(int read_write, size_t bytes, unsigned int
 	static int tpm_sync_needed;
 	static struct stopwatch wake_up_sw;
 
-	if (CONFIG(TPM_CR50)) {
+	if (CONFIG(TPM_GOOGLE)) {
 		/*
 		 * First Cr50 access in each coreboot stage where TPM is used will be
 		 * prepended by a wake up pulse on the CS line.
@@ -186,7 +186,7 @@ static enum cb_err start_transaction(int read_write, size_t bytes, unsigned int
 	 */
 
 	header_resp.body[3] = 0;
-	if (CONFIG(TPM_CR50))
+	if (CONFIG(TPM_GOOGLE))
 		ret = spi_xfer(&spi_slave, header.body, sizeof(header.body), NULL, 0);
 	else
 		ret = spi_xfer(&spi_slave, header.body, sizeof(header.body),
@@ -497,7 +497,7 @@ int tpm2_init(struct spi_slave *spi_if)
 	       tpm_info.vendor_id, tpm_info.device_id, tpm_info.revision);
 
 	/* Do some cr50-specific things here. */
-	if (CONFIG(TPM_CR50) && tpm_info.vendor_id == 0x1ae0) {
+	if (CONFIG(TPM_GOOGLE) && tpm_info.vendor_id == 0x1ae0) {
 		struct cr50_firmware_version ver;
 
 		if (tpm_first_access_this_boot()) {

src/drivers/tpm/Makefile.inc

@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_TPM),y)
+
 ramstage-$(CONFIG_TPM_INIT_RAMSTAGE) += tpm.c
 
 ifeq ($(CONFIG_TPM_PPI),y)
@@ -6,8 +8,6 @@ else
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ppi_stub.c
 endif
 
-bootblock-$(CONFIG_TPM_CR50) += cr50.c
+all-$(CONFIG_TPM_GOOGLE) += cr50.c
-verstage-$(CONFIG_TPM_CR50) += cr50.c
+
-romstage-$(CONFIG_TPM_CR50) += cr50.c
+endif
-ramstage-$(CONFIG_TPM_CR50) += cr50.c
-postcar-$(CONFIG_TPM_CR50) += cr50.c

src/mainboard/acer/aspire_vn7_572g/Kconfig

@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_INT15
 	select INTEL_LPSS_UART_FOR_CONSOLE
-	select MAINBOARD_HAS_CRB_TPM
+	select CRB_TPM
 	select MAINBOARD_HAS_LIBGFXINIT
 	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO

src/mainboard/asrock/b85m_pro4/Kconfig

@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/asrock/h110m/Kconfig

@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SUPERIO_NUVOTON_NCT6791D
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 
 config DISABLE_HECI1_AT_PRE_BOOT
 	default y

src/mainboard/asus/am1i-a/Kconfig

@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOUTHBRIDGE_AMD_AGESA_YANGTZE
 	select DEFAULT_POST_ON_LPC
 	select SUPERIO_ITE_IT8623E
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 
 config MAINBOARD_DIR
 	default "asus/am1i-a"

src/mainboard/asus/h61-series/Kconfig.name

@@ -34,7 +34,7 @@ config BOARD_ASUS_P8H61_M_PRO
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
 	select SUPERIO_NUVOTON_NCT6776
@@ -46,7 +46,7 @@ config BOARD_ASUS_P8H61_M_PRO_CM6630
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select REALTEK_8168_RESET
 	select RT8168_SET_LED_MODE
 	select SUPERIO_NUVOTON_NCT6776

src/mainboard/asus/p8x7x-series/Kconfig.name

@@ -2,7 +2,7 @@ config BOARD_ASUS_P8C_WS
 	bool "P8C_WS"
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SUPERIO_NUVOTON_NCT6776
 	select USE_NATIVE_RAMINIT
 
@@ -18,7 +18,7 @@ config BOARD_ASUS_P8Z77_M_PRO
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SUPERIO_NUVOTON_NCT6779D
 
 config BOARD_ASUS_P8Z77_V_LX2
@@ -34,7 +34,7 @@ config BOARD_ASUS_P8Z77_V
 	select BOARD_ASUS_P8X7X_SERIES
 	select BOARD_ROMSIZE_KB_8192
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SUPERIO_NUVOTON_NCT6779D
 	select USE_NATIVE_RAMINIT

src/mainboard/clevo/cml-u/Kconfig

@@ -9,7 +9,7 @@ config BOARD_CLEVO_CMLU_COMMON
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO
 	select SOC_INTEL_COMETLAKE_1

src/mainboard/clevo/kbl-u/Kconfig

@@ -10,7 +10,7 @@ config BOARD_CLEVO_KBLU_COMMON
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB

src/mainboard/clevo/tgl-u/Kconfig

@@ -9,7 +9,7 @@ config BOARD_CLEVO_TGLU_COMMON
 	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB

src/mainboard/dell/snb_ivb_workstations/Kconfig

@@ -7,7 +7,7 @@ config BOARD_DELL_SNB_IVB_WORKSTATIONS
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SERIRQ_CONTINUOUS_MODE
 	select USE_NATIVE_RAMINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SUPERIO_SMSC_SCH5545

src/mainboard/emulation/qemu-q35/Kconfig

@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_16384 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT if !CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_CHROMEOS
 	select SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT
 	select BOOT_DEVICE_NOT_SPI_FLASH

src/mainboard/facebook/fbg1701/Kconfig

@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_IFD_BIN
 	select HAVE_ME_BIN
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_BRASWELL
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB

src/mainboard/facebook/monolith/Kconfig

@@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select SOC_INTEL_KABYLAKE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select INTEL_GMA_HAVE_VBT

src/mainboard/foxconn/g41s-k/Kconfig

@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
 

src/mainboard/gigabyte/ga-b75m-d3h/Kconfig

@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select SERIRQ_CONTINUOUS_MODE
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 
 config DRAM_RESET_GATE_GPIO
 	int

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 I2C_TPM if !GRU_HAS_TPM2
-	select MAINBOARD_HAS_I2C_TPM_GENERIC 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
 

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

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

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
 

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

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

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
 

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

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

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
 

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
 

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

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

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

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
 

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

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
 

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

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

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

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

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
 

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

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

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

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

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

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

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 I2C_TPM if BOARD_GOOGLE_VOLTEER2_TI50
-	select MAINBOARD_HAS_SPI_TPM_CR50 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

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

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,

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,

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();
 }

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

src/mainboard/hp/compaq_8200_elite_sff/Kconfig

@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
 	select USE_NATIVE_RAMINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT

src/mainboard/hp/folio_9480m/Kconfig

@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LYNXPOINT_LP
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select NORTHBRIDGE_INTEL_HASWELL

src/mainboard/hp/snb_ivb_laptops/Kconfig

@@ -7,7 +7,7 @@ config BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select HAVE_ACPI_TABLES
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SERIRQ_CONTINUOUS_MODE
@@ -86,7 +86,7 @@ config BOARD_HP_PROBOOK_6360B
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_INT15
 	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SOUTHBRIDGE_INTEL_BD82X6X

src/mainboard/hp/z220_series/Kconfig

@@ -8,7 +8,7 @@ config BOARD_HP_Z220_SERIES_COMMON
 	select SERIRQ_CONTINUOUS_MODE
 	select SOUTHBRIDGE_INTEL_BD82X6X
 	select USE_NATIVE_RAMINIT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT

src/mainboard/intel/adlrvp/Kconfig

@@ -53,10 +53,10 @@ config BOARD_INTEL_ADLRVP_M_EXT_EC
 	select FW_CONFIG
 	select FW_CONFIG_SOURCE_CHROMEEC_CBI
 	select INTEL_LPSS_UART_FOR_CONSOLE
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select SOC_INTEL_ALDERLAKE_PCH_M
 	select SPI_TPM
+	select TPM_GOOGLE_CR50
 
 config BOARD_INTEL_ADLRVP_N
 	select BOARD_INTEL_ADLRVP_COMMON

src/mainboard/intel/baskingridge/Kconfig

@@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select INTEL_INT15
 
 config VBOOT

src/mainboard/intel/coffeelake_rvp/Kconfig

@@ -9,7 +9,7 @@ config BOARD_INTEL_COFFEELAKE_RVP_COMMON
 	select HAVE_ACPI_TABLES
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_USES_IFD_EC_REGION
 
 config BOARD_INTEL_COFFEELAKE_RVP8

src/mainboard/intel/galileo/Kconfig

@@ -8,7 +8,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select ENABLE_BUILTIN_HSUART1
 	select HAVE_ACPI_TABLES
 	select SOC_INTEL_QUARK
-	select MAINBOARD_HAS_I2C_TPM_ATMEL
+	select I2C_TPM
+	select TPM_ATMEL
 	select MAINBOARD_HAS_TPM2
 	select UDK_2017_BINDING
 

src/mainboard/intel/glkrvp/Kconfig

@@ -8,7 +8,7 @@ config BOARD_INTEL_BASEBOARD_GLKRVP
 	select HAVE_ACPI_TABLES
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_DA7219
 	select SOC_ESPI

src/mainboard/intel/kblrvp/Kconfig

@@ -8,7 +8,7 @@ config BOARD_INTEL_KBLRVP_COMMON
 	select HAVE_SPD_IN_CBFS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SOC_INTEL_KABYLAKE
 
 config BOARD_INTEL_KBLRVP3

src/mainboard/intel/kunimitsu/Kconfig

@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SOC_INTEL_SKYLAKE
 	select HAVE_SPD_IN_CBFS
 

src/mainboard/intel/shadowmountain/Kconfig

@@ -20,11 +20,12 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_SPD_IN_CBFS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select PCIEXP_HOTPLUG
 	select SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_CSE_LITE_SKU
+	select SPI_TPM
+	select TPM_GOOGLE_CR50
 	select INTEL_CAR_NEM #TODO - Enable INTEL_CAR_NEM_ENHANCED
 
 config CHROMEOS

src/mainboard/intel/strago/Kconfig

@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select SOC_INTEL_BRASWELL
 	select PCIEXP_L1_SUB_STATE
 

src/mainboard/intel/tglrvp/Kconfig

@@ -21,9 +21,9 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_SPD_IN_CBFS
 	select SOC_INTEL_CSE_LITE_SKU
 	select MAINBOARD_HAS_TPM2
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 	select SPI_TPM
+	select TPM_GOOGLE_CR50
 
 config CHROMEOS
 	select EC_GOOGLE_CHROMEEC_SWITCHES if TGL_CHROME_EC

src/mainboard/intel/wtm2/Kconfig

@@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select INTEL_INT15
 
 config VBOOT

src/mainboard/kontron/bsl6/Kconfig

@@ -10,7 +10,7 @@ config BOARD_KONTRON_BSL6_COMMON
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select EC_KONTRON_KEMPLD
 	select MAINBOARD_HAS_LIBGFXINIT
 	select DRIVERS_I2C_NCT7802Y

src/mainboard/kontron/mal10/Kconfig

@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
-	select MAINBOARD_HAS_CRB_TPM
+	select CRB_TPM
 	select MAINBOARD_HAS_LIBGFXINIT
 	select ONBOARD_VGA_IS_PRIMARY
 	select SOC_INTEL_APOLLOLAKE

src/mainboard/lenovo/s230u/Kconfig

@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select SERIRQ_CONTINUOUS_MODE
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select HAVE_SPD_IN_CBFS
 

src/mainboard/lenovo/t410/Kconfig

@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select INTEL_INT15
 	select HAVE_ACPI_RESUME
 	select DRIVERS_LENOVO_WACOM
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select INTEL_GMA_HAVE_VBT

src/mainboard/lenovo/t420/Kconfig

@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
 	select DRIVERS_RICOH_RCE822
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_PANEL_1_ON_LVDS

src/mainboard/lenovo/t420s/Kconfig

@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_PANEL_1_ON_LVDS

src/mainboard/lenovo/t430/Kconfig

@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select INTEL_INT15
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE

src/mainboard/lenovo/t430s/Kconfig

@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select INTEL_INT15
-	select MAINBOARD_HAS_LPC_TPM
+	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_PANEL_1_ON_LVDS if BOARD_LENOVO_T430S