3 files changed, 31 insertions, 30 deletions
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index 76dce0a41b..86bf5438b7 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -77,7 +77,7 @@ enum {
 	LB_TAG_MAC_ADDRS		= 0x0033,
 	LB_TAG_VBOOT_WORKBUF		= 0x0034,
 	LB_TAG_MMC_INFO			= 0x0035,
-	LB_TAG_TCPA_LOG			= 0x0036,
+	LB_TAG_TPM_CB_LOG		= 0x0036,
 	LB_TAG_FMAP			= 0x0037,
 	LB_TAG_PLATFORM_BLOB_VERSION	= 0x0038,
 	LB_TAG_SMMSTOREV2		= 0x0039,
diff --git a/src/commonlib/include/commonlib/tcpa_log_serialized.h b/src/commonlib/include/commonlib/tcpa_log_serialized.h
deleted file mode 100644
index 4190a7db64..0000000000
--- a/src/commonlib/include/commonlib/tcpa_log_serialized.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __TCPA_LOG_SERIALIZED_H__
-#define __TCPA_LOG_SERIALIZED_H__
-
-#include <stdint.h>
-
-#define MAX_TCPA_LOG_ENTRIES 50
-#define TCPA_DIGEST_MAX_LENGTH 64
-#define TCPA_PCR_HASH_NAME 50
-#define TCPA_PCR_HASH_LEN 10
-/* Assumption of 2K TCPA log size reserved for CAR/SRAM */
-#define MAX_PRERAM_TCPA_LOG_ENTRIES 15
-
-struct tcpa_entry {
-	uint32_t pcr;
-	char digest_type[TCPA_PCR_HASH_LEN];
-	uint8_t digest[TCPA_DIGEST_MAX_LENGTH];
-	uint32_t digest_length;
-	char name[TCPA_PCR_HASH_NAME];
-} __packed;
-
-struct tcpa_table {
-	uint16_t max_entries;
-	uint16_t num_entries;
-	struct tcpa_entry entries[0]; /* Variable number of entries */
-} __packed;
-
-#endif
diff --git a/src/commonlib/include/commonlib/tpm_log_serialized.h b/src/commonlib/include/commonlib/tpm_log_serialized.h
new file mode 100644
index 0000000000..dc58dc09c3
--- /dev/null
+++ b/src/commonlib/include/commonlib/tpm_log_serialized.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef COMMONLIB_TPM_LOG_SERIALIZED_H
+#define COMMONLIB_TPM_LOG_SERIALIZED_H
+
+#include <commonlib/bsd/helpers.h>
+#include <stdint.h>
+
+#define MAX_TPM_LOG_ENTRIES 50
+#define TPM_CB_LOG_DIGEST_MAX_LENGTH 64
+#define TPM_CB_LOG_PCR_HASH_NAME 50
+#define TPM_CB_LOG_PCR_HASH_LEN 10
+/* Assumption of 2K TCPA log size reserved for CAR/SRAM */
+#define MAX_PRERAM_TPM_LOG_ENTRIES 15
+
+struct tpm_cb_log_entry {
+	uint32_t pcr;
+	char digest_type[TPM_CB_LOG_PCR_HASH_LEN];
+	uint8_t digest[TPM_CB_LOG_DIGEST_MAX_LENGTH];
+	uint32_t digest_length;
+	char name[TPM_CB_LOG_PCR_HASH_NAME];
+} __packed;
+
+struct tpm_cb_log_table {
+	uint16_t max_entries;
+	uint16_t num_entries;
+	struct tpm_cb_log_entry entries[0]; /* Variable number of entries */
+} __packed;
+
+#endif