diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index e4ccd37abe..fdcbcd3fb5 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -386,10 +386,15 @@ static void acpi_create_tpm2(acpi_tpm2_t *tpm2)
 
 	/* Hard to detect for coreboot. Just set it to 0 */
 	tpm2->platform_class = 0;
-	/* Must be set to 0 for TIS interface support */
-	tpm2->control_area = 0;
-	/* coreboot only supports the TIS interface driver. */
-	tpm2->start_method = 6;
+	if (CONFIG(CRB_TPM)) {
+		/* Must be set to 7 for CRB Support */
+		tpm2->control_area = CONFIG_CRB_TPM_BASE_ADDRESS + 0x40;
+		tpm2->start_method = 7;
+	} else {
+		/* Must be set to 0 for FIFO interface support */
+		tpm2->control_area = 0;
+		tpm2->start_method = 6;
+	}
 	memset(tpm2->msp, 0, sizeof(tpm2->msp));
 
 	/* Fill the log area size and start address fields. */