[do not merge] Combined TPM eventlog

configs/config.emulation_qemu_x86_q35_uefi

@@ -20,7 +20,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS=""

configs/config.emulation_qemu_x86_q35_uefi_all_menus

@@ -15,7 +15,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_CUSTOM_BUILD_PARAMS=""

configs/config.intel_minnowmax

@@ -16,7 +16,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.msi_ms7d25_ddr4

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.msi_ms7d25_ddr5

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.msi_ms7e06_ddr4

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.msi_ms7e06_ddr5

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.novacustom_ns5x_adl

@@ -27,7 +27,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.novacustom_ns5x_tgl

@@ -27,7 +27,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.novacustom_nv4x_adl

@@ -28,7 +28,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.novacustom_nv4x_tgl

@@ -27,7 +27,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.pcengines_apu6

@@ -15,7 +15,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.pcengines_uefi_apu2

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v0.9.0"
+CONFIG_LOCALVERSION="v0.9.1-rc1"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_PCENGINES=y
 CONFIG_VBOOT=y
@@ -20,7 +20,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.pcengines_uefi_apu3

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v0.9.0"
+CONFIG_LOCALVERSION="v0.9.1-rc1"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_PCENGINES=y
 CONFIG_VBOOT=y
@@ -21,7 +21,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.pcengines_uefi_apu4

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v0.9.0"
+CONFIG_LOCALVERSION="v0.9.1-rc1"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_PCENGINES=y
 CONFIG_VBOOT=y
@@ -21,7 +21,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.pcengines_uefi_apu6

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v0.9.0"
+CONFIG_LOCALVERSION="v0.9.1-rc1"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_PCENGINES=y
 CONFIG_VBOOT=y
@@ -21,7 +21,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vault_jsl_v1210

@@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vault_jsl_v1211

@@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vault_jsl_v1410

@@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vault_jsl_v1610

@@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vp2410

@@ -32,7 +32,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_DEVICE_LPC=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vp2420

@@ -35,7 +35,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_DEVICE_LPC=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vp46xx

@@ -33,7 +33,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vp46xx_txt

@@ -34,7 +34,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

configs/config.protectli_vp66xx

@@ -35,7 +35,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_DEVICE_LPC=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="b7e299856027725ceb5b8da7b52f8a395b665f49"
+CONFIG_EDK2_TAG_OR_REV="19b8bc9bf37bdd25769e3ddc58a04a614654733a"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"

payloads/external/Makefile.mk

@@ -279,7 +279,10 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
 		CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI=$(CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI) \
 		CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=$(CONFIG_DRIVERS_EFI_UPDATE_CAPSULES) \
 		CONFIG_DRIVERS_EFI_MAIN_FW_GUID=$(CONFIG_DRIVERS_EFI_MAIN_FW_GUID)
-
+		CONFIG_TPM_HASH_SHA1=$(CONFIG_TPM_HASH_SHA1) \
+		CONFIG_TPM_HASH_SHA256=$(CONFIG_TPM_HASH_SHA256) \
+		CONFIG_TPM_HASH_SHA384=$(CONFIG_TPM_HASH_SHA384) \
+		CONFIG_TPM_HASH_SHA512=$(CONFIG_TPM_HASH_SHA512)
 
 $(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG)
 	$(MAKE) -C payloads/external/edk2 UniversalPayload \

payloads/external/edk2/Makefile

@@ -390,6 +390,22 @@ ifneq ($(CONFIG_CPU_MAX_TEMPERATURE),)
 BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdCpuMaxTemperature=$(CONFIG_CPU_MAX_TEMPERATURE)
 endif
 endif
+# gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask = 0x0000001f
+# The tested options are mutually exclusive (and there is no option for SM3
+# 256).  See https://ticket.coreboot.org/issues/421 for the discussion about
+# supporting multiple hashes simultaneously.
+ifeq ($(CONFIG_TPM_HASH_SHA1),y)
+BUILD_STR += --pcd gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask=0x00000001
+endif
+ifeq ($(CONFIG_TPM_HASH_SHA256),y)
+BUILD_STR += --pcd gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask=0x00000002
+endif
+ifeq ($(CONFIG_TPM_HASH_SHA384),y)
+BUILD_STR += --pcd gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask=0x00000004
+endif
+ifeq ($(CONFIG_TPM_HASH_SHA512),y)
+BUILD_STR += --pcd gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask=0x00000008
+endif
 
 endif
 

src/acpi/acpi.c

@@ -180,6 +180,19 @@ static void acpi_create_mcfg(acpi_header_t *header, void *unused)
 	header->length = current - (unsigned long)mcfg;
 }
 
+static bool should_publish_tpm_log(void)
+{
+	/*
+	 * EDK will publish its own version of the log after parsing and
+	 * importing coreboot's log discovered through CBMEM.
+	 *
+	 * Publishing is done by appending a table, so coreboot must avoid
+	 * adding corresponding log tables to let OS find a more complete one
+	 * from EDK.
+	 */
+	return !CONFIG(PAYLOAD_EDK2) || CONFIG(EDK2_DISABLE_TPM);
+}
+
 static void *get_tcpa_log(u32 *size)
 {
 	const struct cbmem_entry *ce;
@@ -207,7 +220,7 @@ static void *get_tcpa_log(u32 *size)
 
 static void acpi_create_tcpa(acpi_header_t *header, void *unused)
 {
-	if (tlcl_get_family() != TPM_1)
+	if (!should_publish_tpm_log() || tlcl_get_family() != TPM_1)
 		return;
 
 	acpi_tcpa_t *tcpa = (acpi_tcpa_t *)header;
@@ -253,7 +266,7 @@ static void *get_tpm2_log(u32 *size)
 
 static void acpi_create_tpm2(acpi_header_t *header, void *unused)
 {
-	if (tlcl_get_family() != TPM_2)
+	if (!should_publish_tpm_log() || tlcl_get_family() != TPM_2)
 		return;
 
 	acpi_tpm2_t *tpm2 = (acpi_tpm2_t *)header;
@@ -273,7 +286,7 @@ static void acpi_create_tpm2(acpi_header_t *header, void *unused)
 
 	/* Hard to detect for coreboot. Just set it to 0 */
 	tpm2->platform_class = 0;
-	if (CONFIG(CRB_TPM) && tpm2_has_crb_active()) {
+	if (CONFIG(CRB_TPM) && crb_tpm_is_active()) {
 		/* Must be set to 7 for CRB Support */
 		tpm2->control_area = CONFIG_CRB_TPM_BASE_ADDRESS + 0x40;
 		tpm2->start_method = 7;

src/drivers/crb/tis.c

@@ -23,7 +23,7 @@ static const struct {
 	{0xa13a, 0x8086, "Intel iTPM"}
 };
 
-static const char *tis_get_dev_name(struct tpm2_info *info)
+static const char *tis_get_dev_name(struct crb_tpm_info *info)
 {
 	int i;
 
@@ -36,7 +36,7 @@ static const char *tis_get_dev_name(struct tpm2_info *info)
 static tpm_result_t crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, uint8_t *recvbuf,
 				     size_t *rbuf_len)
 {
-	int len = tpm2_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len);
+	int len = crb_tpm_process_command(sendbuf, sbuf_size, recvbuf, *rbuf_len);
 
 	if (len == 0)
 		return TPM_CB_FAIL;
@@ -46,18 +46,18 @@ static tpm_result_t crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, u
 	return TPM_SUCCESS;
 }
 
-static tis_sendrecv_fn crb_tis_probe(enum tpm_family *family)
+tis_sendrecv_fn crb_tis_probe(enum tpm_family *family)
 {
-	struct tpm2_info info;
+	struct crb_tpm_info info;
 
 	/* Wake TPM up (if necessary) */
-	if (tpm2_init())
+	if (crb_tpm_init())
 		return NULL;
 
 	/* CRB interface exists only in TPM2 */
 	*family = TPM_2;
 
-	tpm2_get_info(&info);
+	crb_tpm_get_info(&info);
 
 	printk(BIOS_INFO, "Initialized TPM device %s revision %d\n", tis_get_dev_name(&info),
 	       info.revision);
@@ -73,8 +73,6 @@ static tis_sendrecv_fn crb_tis_probe(enum tpm_family *family)
 	return &crb_tpm_sendrecv;
 }
 
-static const __tis_driver tis_probe_fn crb_tis_driver = crb_tis_probe;
-
 static void crb_tpm_fill_ssdt(const struct device *dev)
 {
 	const char *path = acpi_device_path(dev);
@@ -138,15 +136,15 @@ static tpm_result_t tpm_get_cap(uint32_t property, uint32_t *value)
 
 static int smbios_write_type43_tpm(struct device *dev, int *handle, unsigned long *current)
 {
-	struct tpm2_info info;
+	struct crb_tpm_info info;
 	uint32_t tpm_manuf, tpm_family;
 	uint32_t fw_ver1, fw_ver2;
 	uint8_t major_spec_ver, minor_spec_ver;
 
 	if (tlcl_get_family() == TPM_1)
 		return 0;
 
-	tpm2_get_info(&info);
+	crb_tpm_get_info(&info);
 
 	/* If any of these have invalid values, assume TPM not present or disabled */
 	if (info.vendor_id == 0 || info.vendor_id == 0xFFFF ||