6 files changed, 7 insertions, 5 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 7dc738fbd2..a37c26137e 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -402,6 +402,12 @@ config TPM2
 
 	  If unsure, say N.
 
+config MAINBOARD_HAS_TPM_CR50
+	bool
+	default y if MAINBOARD_HAS_SPI_TPM_CR50 || MAINBOARD_HAS_I2C_TPM_CR50
+	default n
+	select MAINBOARD_HAS_TPM2
+
 config HEAP_SIZE
 	hex
 	default 0x4000
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index ccffae50c5..7727a4cad2 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select I2C_TPM
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_I2C_TPM_CR50
-	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_USES_FSP2_0
 	select SOC_INTEL_KABYLAKE
 	select TPM2
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index feb14c0bcb..0fce7cc167 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -37,7 +37,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_DO_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select MAINBOARD_HAS_TPM2 if GRU_HAS_TPM2
 	select RAM_CODE_SUPPORT
 	select RTC
 	select SOC_ROCKCHIP_RK3399
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index a334856351..03ce99b8b9 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -62,7 +62,6 @@ config POPPY_USE_SPI_TPM
 	bool
 	default n
 	select MAINBOARD_HAS_SPI_TPM_CR50
-	select MAINBOARD_HAS_TPM2
 	select SPI_TPM
 	select TPM2
 
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index c4bf212d02..8fb6056050 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -14,7 +14,6 @@ config BOARD_GOOGLE_BASEBOARD_REEF
 	select HAVE_ACPI_TABLES
 	select I2C_TPM
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_TPM2
 	select MAINBOARD_HAS_I2C_TPM_CR50
 	select TPM2
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index ab2478212d..1a4ac4fbbe 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -33,7 +33,7 @@ if CHROMEOS
 
 config CR50_IMMEDIATELY_COMMIT_FW_SECDATA
 	bool
-	default y if MAINBOARD_HAS_I2C_TPM_CR50 || MAINBOARD_HAS_SPI_TPM_CR50
+	default y if MAINBOARD_HAS_TPM_CR50
 
 config CHROMEOS_RAMOOPS
 	bool "Reserve space for Chrome OS ramoops"