diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 1fcd5eb5ac..03a78fd777 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -51,7 +51,8 @@ void mainboard_update_soc_chip_config(struct soc_intel_tigerlake_config *cfg)
 		return;
 	}
 
-	if (cr50_is_long_interrupt_pulse_enabled()) {
+	if (CONFIG(MAINBOARD_HAS_SPI_TPM_CR50) &&
+	    cr50_is_long_interrupt_pulse_enabled()) {
 		printk(BIOS_INFO, "Enabling S0i3.4\n");
 	} else {
 		/*
diff --git a/src/vendorcode/google/chromeos/cse_board_reset.c b/src/vendorcode/google/chromeos/cse_board_reset.c
index 65e09aeedb..0b213a66de 100644
--- a/src/vendorcode/google/chromeos/cse_board_reset.c
+++ b/src/vendorcode/google/chromeos/cse_board_reset.c
@@ -16,24 +16,27 @@ void cse_board_reset(void)
 	int ret;
 	struct cr50_firmware_version version;
 
-	/* Initialize TPM and get the cr50 firmware version. */
-	ret = tlcl_lib_init();
-	if (ret != VB2_SUCCESS) {
-		printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", ret);
-		return;
+	if (CONFIG(MAINBOARD_HAS_SPI_TPM_CR50)) {
+		/* Initialize TPM and get the cr50 firmware version. */
+		ret = tlcl_lib_init();
+		if (ret != VB2_SUCCESS) {
+			printk(BIOS_ERR, "tlcl_lib_init() failed: 0x%x\n", ret);
+			return;
+		}
+
+		cr50_get_firmware_version(&version);
+
+		/*
+		 * Cr50 firmware versions 0.[3|4].20 or newer support strap
+		 * config 0xe where PLTRST from AP is connected to cr50's
+		 * PLTRST# signal. So return immediately and trigger a global
+		 * reset.
+		 */
+		if (version.epoch != 0 || version.major > 4 ||
+		    (version.major >= 3 && version.minor >= 20))
+			return;
 	}
 
-	cr50_get_firmware_version(&version);
-
-	/*
-	 * Cr50 firmware versions 0.[3|4].20 or newer support strap config 0xe where PLTRST from
-	 * AP is connected to cr50's PLTRST# signal. So return immediately and trigger a
-	 * global reset.
-	 */
-	if (version.epoch != 0 || version.major > 4 ||
-			(version.major >= 3 && version.minor >= 20))
-		return;
-
 	printk(BIOS_INFO, "Initiating request to EC to trigger cold reset\n");
 	/*
 	 * Clean the data cache and set the full reset bit, so that when EC toggles