diff --git a/src/mainboard/siemens/mc_rpl/Kconfig b/src/mainboard/siemens/mc_rpl/Kconfig
index 4902b49a44..5281bb5d86 100644
--- a/src/mainboard/siemens/mc_rpl/Kconfig
+++ b/src/mainboard/siemens/mc_rpl/Kconfig
@@ -51,9 +51,6 @@ config DIMM_SPD_SIZE
 	int
 	default 256
 
-config DRIVER_TPM_SPI_BUS
-	default 0x2 if BOARD_SIEMENS_MC_RPL1
-
 config USE_PM_ACPI_TIMER
 	default n if BOARD_SIEMENS_MC_RPL1
 endif
diff --git a/src/mainboard/siemens/mc_rpl/devicetree.cb b/src/mainboard/siemens/mc_rpl/devicetree.cb
index 46c8b7bbae..a5af508a2f 100644
--- a/src/mainboard/siemens/mc_rpl/devicetree.cb
+++ b/src/mainboard/siemens/mc_rpl/devicetree.cb
@@ -32,35 +32,6 @@ chip soc/intel/alderlake
 	register "s0ix_enable" = "true"
 	register "dptf_enable" = "true"
 
-	register "serial_io_gspi_mode" = "{
-		[PchSerialIoIndexGSPI0] = PchSerialIoPci,
-		[PchSerialIoIndexGSPI1] = PchSerialIoPci,
-		[PchSerialIoIndexGSPI2] = PchSerialIoDisabled,
-		[PchSerialIoIndexGSPI3] = PchSerialIoDisabled,
-	}"
-
-	register "serial_io_gspi_cs_mode" = "{
-		[PchSerialIoIndexGSPI0] = 0,
-		[PchSerialIoIndexGSPI1] = 1,
-		[PchSerialIoIndexGSPI2] = 0,
-		[PchSerialIoIndexGSPI3] = 0,
-	}"
-
-	register "serial_io_gspi_cs_state" = "{
-		[PchSerialIoIndexGSPI0] = 0,
-		[PchSerialIoIndexGSPI1] = 0,
-		[PchSerialIoIndexGSPI2] = 0,
-		[PchSerialIoIndexGSPI3] = 0,
-	}"
-
-	# Intel Common SoC Config
-	register "common_soc_config" = "{
-		.gspi[1] = {
-			.speed_mhz = 1,
-			.early_init = 1,
-		},
-	}"
-
 	device domain 0 on
 		device ref igpu on end
 		device ref dtt on
@@ -160,16 +131,7 @@ chip soc/intel/alderlake
 		end
 		device ref crashlog off end
 		device ref sata on end
-		device ref gspi0 on end
 		device ref p2sb on end
-		device ref gspi1 on
-			chip drivers/spi/acpi
-				register "hid" = "ACPI_DT_NAMESPACE_HID"
-				register "compat_string" = ""google,cr50""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E3_IRQ)"
-				device spi 0 on end
-			end
-		end
 		device ref smbus on end
 	end
 end
diff --git a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
index 9f2d691d0e..f57e2cbf0d 100644
--- a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
+++ b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
@@ -5,6 +5,10 @@ if BOARD_SIEMENS_MC_RPL1
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select INTEL_LPSS_UART_FOR_CONSOLE
+	select MAINBOARD_HAS_TPM2
+	select MEMORY_MAPPED_TPM
+	select TPM_MEASURED_BOOT
+	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK
 
 config UART_FOR_CONSOLE
 	int
diff --git a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/overridetree.cb b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/overridetree.cb
index e95e8b8a22..b6ba91a40d 100644
--- a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/overridetree.cb
+++ b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/overridetree.cb
@@ -19,6 +19,13 @@ chip soc/intel/alderlake
 	register "usb3_ports[2]" = "USB3_PORT_EMPTY"		# Port is unused
 	register "usb3_ports[3]" = "USB3_PORT_EMPTY"		# Port is unused
 
+	register "serial_io_gspi_mode" = "{
+		[PchSerialIoIndexGSPI0] = PchSerialIoDisabled,
+		[PchSerialIoIndexGSPI1] = PchSerialIoDisabled,
+		[PchSerialIoIndexGSPI2] = PchSerialIoDisabled,
+		[PchSerialIoIndexGSPI3] = PchSerialIoDisabled,
+	}"
+
 	register "serial_io_i2c_mode" = "{
 		[PchSerialIoIndexI2C0] = PchSerialIoPci,
 		[PchSerialIoIndexI2C1] = PchSerialIoPci,
@@ -116,5 +123,10 @@ chip soc/intel/alderlake
 		device ref uart0 on end
 		device ref uart1 on end
 		device ref uart2 on end
+		device ref fast_spi on
+			chip drivers/pc80/tpm   # SPI TPM header
+				device pnp 0c31.0 on end
+			end
+		end
 	end
 end