From 49baca08ca92a82d2532fe7225b904eb8531b383 Mon Sep 17 00:00:00 2001 From: rdiaz Date: Thu, 5 Dec 2024 00:58:22 +0000 Subject: [PATCH] Updated line endings in specific .inf files that were failing CI. Added Tcg2AcpiFfa.inf to the SecurityPkg.dsc as it was failing in CI as well. --- .../FmpAuthenticationLibPkcs7.inf | 8 +- .../OemTpm2InitLibNull/OemTpm2InitLib.inf | 68 ++++---- .../OemTpm2InitLibVendorNull.inf | 74 ++++----- .../Tcg2PhysicalPresencePromptLibConsole.inf | 74 ++++----- .../Library/Tpm2DebugLib/Tpm2DebugLibNull.inf | 70 ++++---- .../Tpm2DebugLib/Tpm2DebugLibSimple.inf | 72 ++++----- .../Tpm2DebugLib/Tpm2DebugLibVerbose.inf | 72 ++++----- SecurityPkg/SecurityPkg.dsc | 4 + SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf | 8 +- SecurityPkg/Tcg/Tcg2AcpiFfa/Tcg2AcpiFfa.inf | 150 +++++++++--------- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 2 +- 11 files changed, 303 insertions(+), 299 deletions(-) diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf index e51d0bce21..3b071d7709 100644 --- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf +++ b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf @@ -31,7 +31,7 @@ MdeModulePkg/MdeModulePkg.dec SecurityPkg/SecurityPkg.dec CryptoPkg/CryptoPkg.dec - FmpDevicePkg/FmpDevicePkg.dec ## MU_CHANGE + FmpDevicePkg/FmpDevicePkg.dec ## MU_CHANGE [LibraryClasses] BaseLib @@ -40,8 +40,8 @@ MemoryAllocationLib BaseCryptLib -[Pcd] - gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE - +[Pcd] + gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE + [Guids] gEfiCertPkcs7Guid ## CONSUMES ## GUID diff --git a/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLib.inf b/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLib.inf index 519a234830..9af7c6d7eb 100644 --- a/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLib.inf +++ b/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLib.inf @@ -1,34 +1,34 @@ -## @file OemTpm2InitLib.inf -# Shared library for common TPM 2.0 init routines. -# Mostly TPM 2.0 disablement features. -# -# @copyright -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# @par Specification Reference: -# -## - - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = OemTpm2InitLibNull - FILE_GUID = 11A600C7-2B83-4AC4-9B50-E2B0502704AA - VERSION_STRING = 1.0 - MODULE_TYPE = BASE - LIBRARY_CLASS = OemTpm2InitLib - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - OemTpm2InitLib.c - - -[Packages] - MdePkg/MdePkg.dec +## @file OemTpm2InitLib.inf +# Shared library for common TPM 2.0 init routines. +# Mostly TPM 2.0 disablement features. +# +# @copyright +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# @par Specification Reference: +# +## + + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = OemTpm2InitLibNull + FILE_GUID = 11A600C7-2B83-4AC4-9B50-E2B0502704AA + VERSION_STRING = 1.0 + MODULE_TYPE = BASE + LIBRARY_CLASS = OemTpm2InitLib + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + OemTpm2InitLib.c + + +[Packages] + MdePkg/MdePkg.dec diff --git a/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLibVendorNull.inf b/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLibVendorNull.inf index 84187e3445..2dc751650c 100644 --- a/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLibVendorNull.inf +++ b/SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLibVendorNull.inf @@ -1,37 +1,37 @@ -## @file OemTpm2InitLibVendorNull.inf -# -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# This is an null version of the vendor-specific lib that can be used -# for TPM parts that don't require an special initialization. -# -## - - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = OemTpm2InitLibVendorNull - FILE_GUID = D90742CF-A613-44B2-9526-6E8DB751CE00 - VERSION_STRING = 1.0 - MODULE_TYPE = BASE - LIBRARY_CLASS = OemTpm2InitLibVendor - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - OemTpm2InitLibVendorNull.c - - -[Packages] - MdePkg/MdePkg.dec - SecurityPkg/SecurityPkg.dec - - -[LibraryClasses] - +## @file OemTpm2InitLibVendorNull.inf +# +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# This is an null version of the vendor-specific lib that can be used +# for TPM parts that don't require an special initialization. +# +## + + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = OemTpm2InitLibVendorNull + FILE_GUID = D90742CF-A613-44B2-9526-6E8DB751CE00 + VERSION_STRING = 1.0 + MODULE_TYPE = BASE + LIBRARY_CLASS = OemTpm2InitLibVendor + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + OemTpm2InitLibVendorNull.c + + +[Packages] + MdePkg/MdePkg.dec + SecurityPkg/SecurityPkg.dec + + +[LibraryClasses] + diff --git a/SecurityPkg/Library/Tcg2PhysicalPresencePromptLib/Tcg2PhysicalPresencePromptLibConsole.inf b/SecurityPkg/Library/Tcg2PhysicalPresencePromptLib/Tcg2PhysicalPresencePromptLibConsole.inf index 76df9807d5..2e01102d3f 100644 --- a/SecurityPkg/Library/Tcg2PhysicalPresencePromptLib/Tcg2PhysicalPresencePromptLibConsole.inf +++ b/SecurityPkg/Library/Tcg2PhysicalPresencePromptLib/Tcg2PhysicalPresencePromptLibConsole.inf @@ -1,37 +1,37 @@ -## @file Tcg2PhysicalPresencePromptLibConsole.inf -# This instance of the Tcg2PhysicalPresencePromptLib uses the console and basic key input -# to prompt the user. -# -## -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -## - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = Tcg2PhysicalPresencePromptLibConsole - FILE_GUID = 54A17646-E8E3-4BED-A7D8-D9E5E7684E85 - VERSION_STRING = 1.0 - MODULE_TYPE = DXE_DRIVER - LIBRARY_CLASS = Tcg2PhysicalPresencePromptLib|DXE_DRIVER - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - Tcg2PhysicalPresencePromptLibConsole.c - - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - - -[LibraryClasses] - BaseLib - UefiLib - UefiBootServicesTableLib +## @file Tcg2PhysicalPresencePromptLibConsole.inf +# This instance of the Tcg2PhysicalPresencePromptLib uses the console and basic key input +# to prompt the user. +# +## +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = Tcg2PhysicalPresencePromptLibConsole + FILE_GUID = 54A17646-E8E3-4BED-A7D8-D9E5E7684E85 + VERSION_STRING = 1.0 + MODULE_TYPE = DXE_DRIVER + LIBRARY_CLASS = Tcg2PhysicalPresencePromptLib|DXE_DRIVER + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + Tcg2PhysicalPresencePromptLibConsole.c + + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + + +[LibraryClasses] + BaseLib + UefiLib + UefiBootServicesTableLib diff --git a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibNull.inf b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibNull.inf index b6e9bd9943..ff91c3d82e 100644 --- a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibNull.inf +++ b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibNull.inf @@ -1,35 +1,35 @@ -## @file Tpm2DebugLibNull.inf -# This file contains helper functions to do nothing. -# -## -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = Tpm2DebugLibNull - FILE_GUID = 97a27b03-286f-4237-a7c3-a09a1b6e6e2d - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = Tpm2DebugLib - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - Tpm2DebugLibNull.c - - -[Packages] - MdePkg/MdePkg.dec - - -[LibraryClasses] - DebugLib +## @file Tpm2DebugLibNull.inf +# This file contains helper functions to do nothing. +# +## +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = Tpm2DebugLibNull + FILE_GUID = 97a27b03-286f-4237-a7c3-a09a1b6e6e2d + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = Tpm2DebugLib + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + Tpm2DebugLibNull.c + + +[Packages] + MdePkg/MdePkg.dec + + +[LibraryClasses] + DebugLib diff --git a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibSimple.inf b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibSimple.inf index 310d0b7dc0..ea7487a09c 100644 --- a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibSimple.inf +++ b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibSimple.inf @@ -1,36 +1,36 @@ -## @file Tpm2DebugLibSimple.inf -# This file contains helper functions to perform a simple debugging of -# TPM transactions as they go to and from the TPM device. -# -## -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = Tpm2DebugLibSimple - FILE_GUID = d48907a4-5b42-425a-b6d3-046d31c09b7b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = Tpm2DebugLib - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - Tpm2DebugLibSimple.c - - -[Packages] - MdePkg/MdePkg.dec - - -[LibraryClasses] - DebugLib +## @file Tpm2DebugLibSimple.inf +# This file contains helper functions to perform a simple debugging of +# TPM transactions as they go to and from the TPM device. +# +## +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = Tpm2DebugLibSimple + FILE_GUID = d48907a4-5b42-425a-b6d3-046d31c09b7b + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = Tpm2DebugLib + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + Tpm2DebugLibSimple.c + + +[Packages] + MdePkg/MdePkg.dec + + +[LibraryClasses] + DebugLib diff --git a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibVerbose.inf b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibVerbose.inf index da2ec23bf6..7ce12c5f68 100644 --- a/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibVerbose.inf +++ b/SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibVerbose.inf @@ -1,36 +1,36 @@ -## @file Tpm2DebugLibVerbose.inf -# This file contains helper functions to perform a detailed debugging of -# TPM transactions as they go to and from the TPM device. -# -## -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - - -[Defines] - INF_VERSION = 0x00010017 - BASE_NAME = Tpm2DebugLibVerbose - FILE_GUID = 91493EA7-5F06-426E-B4C6-EF87208CE4EB - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = Tpm2DebugLib - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 -# - - -[Sources] - Tpm2DebugLibVerbose.c - - -[Packages] - MdePkg/MdePkg.dec - - -[LibraryClasses] - DebugLib +## @file Tpm2DebugLibVerbose.inf +# This file contains helper functions to perform a detailed debugging of +# TPM transactions as they go to and from the TPM device. +# +## +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + + +[Defines] + INF_VERSION = 0x00010017 + BASE_NAME = Tpm2DebugLibVerbose + FILE_GUID = 91493EA7-5F06-426E-B4C6-EF87208CE4EB + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = Tpm2DebugLib + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + + +[Sources] + Tpm2DebugLibVerbose.c + + +[Packages] + MdePkg/MdePkg.dec + + +[LibraryClasses] + DebugLib diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 5312de456b..856442fd72 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -418,6 +418,10 @@ # SecurityPkg/FvReportPei/FvReportPei.inf +[Components.AARCH64] + SecurityPkg/Tcg/Tcg2Acpi/Tcg2AcpiFfa.inf + SecurityPkg/Library/DxeTcg2PhysicalPresenceMinimumLib/DxeTcg2PhysicalPresenceMinimumLib.inf + [BuildOptions] MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:256 INTEL:*_*_IA32_DLINK_FLAGS = /ALIGN:256 diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf index bfb07e1d5e..82bed77c8c 100644 --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf @@ -87,10 +87,10 @@ gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType ## CONSUMES gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml ## CONSUMES gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa ## CONSUMES - ## MU_CHANGE - # Allow a platform to drop TCG ACPI measurements until we have a chance to make them more - # consistent and functional. - gEfiSecurityPkgTokenSpaceGuid.PcdSkipTcgSmmAcpiMeasurements ## CONSUMES + ## MU_CHANGE + # Allow a platform to drop TCG ACPI measurements until we have a chance to make them more + # consistent and functional. + gEfiSecurityPkgTokenSpaceGuid.PcdSkipTcgSmmAcpiMeasurements ## CONSUMES [Depex] gEfiAcpiTableProtocolGuid AND diff --git a/SecurityPkg/Tcg/Tcg2AcpiFfa/Tcg2AcpiFfa.inf b/SecurityPkg/Tcg/Tcg2AcpiFfa/Tcg2AcpiFfa.inf index eefb0688b4..0dee716774 100644 --- a/SecurityPkg/Tcg/Tcg2AcpiFfa/Tcg2AcpiFfa.inf +++ b/SecurityPkg/Tcg/Tcg2AcpiFfa/Tcg2AcpiFfa.inf @@ -1,75 +1,75 @@ -## @file -# Provides ACPI methods for TPM 2.0 support -# -# Spec Compliance Info: -# "TCG ACPI Specification Version 1.4 Revision 15" -# "TCG PC Client Platform Firmware Profile Specification for TPM Family 2.0 Revision 1.04 v14" -# -# This driver implements TPM 2.0 definition block in ACPI table for FF-A over CRB. -# -# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = Tcg2AcpiFfa - FILE_GUID = 11DACB85-F5DC-4717-9DB1-53E7DC725C20 - MODULE_TYPE = DXE_DRIVER - PI_SPECIFICATION_VERSION = 0x0001000A - VERSION_STRING = 1.0 - ENTRY_POINT = InitializeTcgAcpiFfa - -[Sources] - Tcg2AcpiFfa.c - Tpm2Ffa.asl - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - SecurityPkg/SecurityPkg.dec - -[LibraryClasses] - BaseLib - BaseMemoryLib - UefiDriverEntryPoint - UefiBootServicesTableLib - DebugLib - DxeServicesLib - TpmMeasurementLib - Tpm2CommandLib - Tcg2PhysicalPresenceLib - PcdLib - -[Guids] - gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCES ## GUID # TPM device identifier - -[Protocols] - gEfiAcpiTableProtocolGuid ## CONSUMES - -[Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision ## SOMETIMES_CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass ## SOMETIMES_CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2PossibleIrqNumBuf ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdSkipTcgSmmAcpiMeasurements ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa ## CONSUMES - -[FixedPcd] - gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES - gEfiSecurityPkgTokenSpaceGuid.PcdTpmMaxAddress ## CONSUMES - -[Depex] - gEfiAcpiTableProtocolGuid AND - gEfiTcg2ProtocolGuid +## @file +# Provides ACPI methods for TPM 2.0 support +# +# Spec Compliance Info: +# "TCG ACPI Specification Version 1.4 Revision 15" +# "TCG PC Client Platform Firmware Profile Specification for TPM Family 2.0 Revision 1.04 v14" +# +# This driver implements TPM 2.0 definition block in ACPI table for FF-A over CRB. +# +# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = Tcg2AcpiFfa + FILE_GUID = 11DACB85-F5DC-4717-9DB1-53E7DC725C20 + MODULE_TYPE = DXE_DRIVER + PI_SPECIFICATION_VERSION = 0x0001000A + VERSION_STRING = 1.0 + ENTRY_POINT = InitializeTcgAcpiFfa + +[Sources] + Tcg2AcpiFfa.c + Tpm2Ffa.asl + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + SecurityPkg/SecurityPkg.dec + +[LibraryClasses] + BaseLib + BaseMemoryLib + UefiDriverEntryPoint + UefiBootServicesTableLib + DebugLib + DxeServicesLib + TpmMeasurementLib + Tpm2CommandLib + Tcg2PhysicalPresenceLib + PcdLib + +[Guids] + gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCES ## GUID # TPM device identifier + +[Protocols] + gEfiAcpiTableProtocolGuid ## CONSUMES + +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision ## SOMETIMES_CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass ## SOMETIMES_CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2PossibleIrqNumBuf ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdActiveTpmInterfaceType ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdSkipTcgSmmAcpiMeasurements ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa ## CONSUMES + +[FixedPcd] + gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdTpmMaxAddress ## CONSUMES + +[Depex] + gEfiAcpiTableProtocolGuid AND + gEfiTcg2ProtocolGuid diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf index 06304be77e..4583918ec9 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf @@ -97,7 +97,7 @@ [Protocols] gEfiTcg2ProtocolGuid ## PRODUCES - gMuTcg2ProtocolExGuid ## PRODUCES # MU_CHANGE - Add a new protocol to support Log-only events. + gMuTcg2ProtocolExGuid ## PRODUCES # MU_CHANGE - Add a new protocol to support Log-only events. gEfiTcg2FinalEventsTableGuid ## PRODUCES gEfiMpServiceProtocolGuid ## SOMETIMES_CONSUMES gEfiVariableWriteArchProtocolGuid ## NOTIFY