diff --git a/src/mainboard/siemens/fa_ehl/variants/fa_ehl/Kconfig b/src/mainboard/siemens/fa_ehl/variants/fa_ehl/Kconfig
index ecde36d9a3..b57abc493f 100644
--- a/src/mainboard/siemens/fa_ehl/variants/fa_ehl/Kconfig
+++ b/src/mainboard/siemens/fa_ehl/variants/fa_ehl/Kconfig
@@ -4,13 +4,8 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select DRIVERS_I2C_RV3028C7
 	select DRIVER_INTEL_I210
-	select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
 	select EHL_TSN_DRIVER
 	select DRIVERS_ETH_PHY_M88E1512
-	select MAINBOARD_HAS_TPM2
-	select MEMORY_MAPPED_TPM
-	select TPM_MEASURED_BOOT
-	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK
 
 config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/fa_ehl.fmd"
diff --git a/src/mainboard/siemens/fa_ehl/variants/fa_ehl/devicetree.cb b/src/mainboard/siemens/fa_ehl/variants/fa_ehl/devicetree.cb
index f14c225a0b..bc6958d88b 100644
--- a/src/mainboard/siemens/fa_ehl/variants/fa_ehl/devicetree.cb
+++ b/src/mainboard/siemens/fa_ehl/variants/fa_ehl/devicetree.cb
@@ -238,11 +238,7 @@ chip soc/intel/elkhartlake
 			end
 		end
 
-		device pci 1f.0 on	    # eSPI Interface
-			chip drivers/pc80/tpm
-				device pnp 0c31.0 on end
-			end
-		end
+		device pci 1f.0 off end # eSPI Interface
 		device pci 1f.2 hidden	end # Power Management Controller
 		device pci 1f.4	on	end # SMBus
 		device pci 1f.5 on	end # PCH SPI (flash & TPM)