diff --git a/config/coreboot-librem_13v2.config b/config/coreboot-librem_13v2.config
index 5de06ebcb..1a39b298c 100644
--- a/config/coreboot-librem_13v2.config
+++ b/config/coreboot-librem_13v2.config
@@ -616,8 +616,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM1=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM1 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
diff --git a/config/coreboot-librem_13v4.config b/config/coreboot-librem_13v4.config
index 804cb751b..7d681c828 100644
--- a/config/coreboot-librem_13v4.config
+++ b/config/coreboot-librem_13v4.config
@@ -616,8 +616,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM1=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM1 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
diff --git a/config/coreboot-librem_14.config b/config/coreboot-librem_14.config
index b15087466..c86cbc8bc 100644
--- a/config/coreboot-librem_14.config
+++ b/config/coreboot-librem_14.config
@@ -615,8 +615,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM1=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM1 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
diff --git a/config/coreboot-librem_15v3.config b/config/coreboot-librem_15v3.config
index 03d27de94..70e3300c2 100644
--- a/config/coreboot-librem_15v3.config
+++ b/config/coreboot-librem_15v3.config
@@ -616,8 +616,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM1=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM1 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
diff --git a/config/coreboot-librem_15v4.config b/config/coreboot-librem_15v4.config
index 80a80bf72..e7dff7e12 100644
--- a/config/coreboot-librem_15v4.config
+++ b/config/coreboot-librem_15v4.config
@@ -616,8 +616,8 @@ CONFIG_MAINBOARD_HAS_TPM1=y
 # CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM1=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM1 is not set
 CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA=""
 CONFIG_PCR_BOOT_MODE=1
 CONFIG_PCR_HWID=1
diff --git a/config/coreboot-librem_l1um_v2.config b/config/coreboot-librem_l1um_v2.config
index 8b473eb0a..d146c1550 100644
--- a/config/coreboot-librem_l1um_v2.config
+++ b/config/coreboot-librem_l1um_v2.config
@@ -610,8 +610,8 @@ CONFIG_TPM=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_LOG_CB is not set
-CONFIG_TPM_LOG_TPM2=y
+CONFIG_TPM_LOG_CB=y
+# CONFIG_TPM_LOG_TPM2 is not set
 # CONFIG_TPM_HASH_SHA1 is not set
 CONFIG_TPM_HASH_SHA256=y
 # CONFIG_TPM_HASH_SHA384 is not set