diff --git a/coreboot b/coreboot
index d48dd84..afb3a7b 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit d48dd84ae807162de3a61b21e3f7f4fb73c36c38
+Subproject commit afb3a7bd224dc3fc3840f7b07849f8ec4aa2214e
diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config
index 0e38d73..bc42282 100644
--- a/models/darp5/coreboot.config
+++ b/models/darp5/coreboot.config
@@ -111,10 +111,12 @@ CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
+CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 CONFIG_DIMM_MAX=2
+CONFIG_TPM_PIRQ=0x1F
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -622,8 +624,9 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -646,13 +649,17 @@ CONFIG_DRIVERS_MC146818=y
 #
 # Trusted Platform Module
 #
-CONFIG_USER_NO_TPM=y
+CONFIG_TPM2=y
+CONFIG_MAINBOARD_HAS_TPM2=y
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -781,7 +788,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config
index 555a1a4..954439c 100644
--- a/models/darp6/coreboot.config
+++ b/models/darp6/coreboot.config
@@ -111,10 +111,12 @@ CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
+CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 CONFIG_DIMM_MAX=2
+CONFIG_TPM_PIRQ=0x1F
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -622,8 +624,9 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -646,13 +649,17 @@ CONFIG_DRIVERS_MC146818=y
 #
 # Trusted Platform Module
 #
-CONFIG_USER_NO_TPM=y
+CONFIG_TPM2=y
+CONFIG_MAINBOARD_HAS_TPM2=y
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -781,7 +788,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index 599c7dc..61d3dde 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -111,10 +111,12 @@ CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
+CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 CONFIG_DIMM_MAX=2
+CONFIG_TPM_PIRQ=0x1F
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -622,8 +624,9 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -646,13 +649,17 @@ CONFIG_DRIVERS_MC146818=y
 #
 # Trusted Platform Module
 #
-CONFIG_USER_NO_TPM=y
+CONFIG_TPM2=y
+CONFIG_MAINBOARD_HAS_TPM2=y
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -781,7 +788,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config
index c5ce5f1..392ea8f 100644
--- a/models/galp4/coreboot.config
+++ b/models/galp4/coreboot.config
@@ -111,10 +111,12 @@ CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
+CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 CONFIG_DIMM_MAX=2
+CONFIG_TPM_PIRQ=0x1F
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -622,8 +624,9 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -646,13 +649,17 @@ CONFIG_DRIVERS_MC146818=y
 #
 # Trusted Platform Module
 #
-CONFIG_USER_NO_TPM=y
+CONFIG_TPM2=y
+CONFIG_MAINBOARD_HAS_TPM2=y
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -781,7 +788,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
diff --git a/models/lemp9/coreboot.config b/models/lemp9/coreboot.config
index 5134d66..bcfb79b 100644
--- a/models/lemp9/coreboot.config
+++ b/models/lemp9/coreboot.config
@@ -108,10 +108,12 @@ CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
+CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 CONFIG_DIMM_MAX=2
+CONFIG_TPM_PIRQ=0x1F
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Lemur Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -612,8 +614,9 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -636,13 +639,17 @@ CONFIG_DRIVERS_MC146818=y
 #
 # Trusted Platform Module
 #
-CONFIG_USER_NO_TPM=y
+CONFIG_TPM2=y
+CONFIG_MAINBOARD_HAS_TPM2=y
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# CONFIG_INTEL_TXT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -772,7 +779,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_GENERIC_SPD_BIN=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set