diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 0e58215e2a..60c98c0974 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -10,14 +10,11 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_BOARDID
 	select EC_GOOGLE_CHROMEEC_LPC
+	select HAS_TPM if !VBOOT_MOCK_SECDATA
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_TPM2
-	select MAINBOARD_HAS_SPI_TPM_CR50
 	select SOC_ESPI
-	select SPI_TPM
-	select TPM2
 
 if BOARD_GOOGLE_BASEBOARD_OCTOPUS
 
@@ -63,6 +60,14 @@ config GBB_HWID
 	default "BIP TEST 5732" if BOARD_GOOGLE_BIP
 	default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS
 
+config HAS_TPM
+	bool
+	default n
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select MAINBOARD_HAS_TPM2
+	select SPI_TPM
+	select TPM2
+
 config MAX_CPUS
 	int
 	default 4