diff --git a/EmbeddedPkg/Library/FdtLib/Makefile.libfdt b/EmbeddedPkg/Library/FdtLib/Makefile.libfdt index 5b74948d9e..7d9fd573b1 100644 --- a/EmbeddedPkg/Library/FdtLib/Makefile.libfdt +++ b/EmbeddedPkg/Library/FdtLib/Makefile.libfdt @@ -1,11 +1,11 @@ -# Makefile.libfdt -# -# This is not a complete Makefile of itself. Instead, it is designed to -# be easily embeddable into other systems of Makefiles. -# -LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 -LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h -LIBFDT_VERSION = version.lds +# Makefile.libfdt +# +# This is not a complete Makefile of itself. Instead, it is designed to +# be easily embeddable into other systems of Makefiles. +# +LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 +LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h +LIBFDT_VERSION = version.lds LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ fdt_addresses.c -LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) +LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) diff --git a/EmbeddedPkg/Library/FdtLib/TODO b/EmbeddedPkg/Library/FdtLib/TODO index 288437e394..c8c4cf7f32 100644 --- a/EmbeddedPkg/Library/FdtLib/TODO +++ b/EmbeddedPkg/Library/FdtLib/TODO @@ -1,3 +1,3 @@ -- Tree traversal functions -- Graft function -- Complete libfdt.h documenting comments +- Tree traversal functions +- Graft function +- Complete libfdt.h documenting comments diff --git a/EmbeddedPkg/Library/FdtLib/version.lds b/EmbeddedPkg/Library/FdtLib/version.lds index 84538f697d..7d6dad2a9c 100644 --- a/EmbeddedPkg/Library/FdtLib/version.lds +++ b/EmbeddedPkg/Library/FdtLib/version.lds @@ -1,67 +1,67 @@ -LIBFDT_1.2 { - global: - fdt_next_node; - fdt_check_header; - fdt_move; - fdt_string; - fdt_num_mem_rsv; - fdt_get_mem_rsv; - fdt_subnode_offset_namelen; - fdt_subnode_offset; +LIBFDT_1.2 { + global: + fdt_next_node; + fdt_check_header; + fdt_move; + fdt_string; + fdt_num_mem_rsv; + fdt_get_mem_rsv; + fdt_subnode_offset_namelen; + fdt_subnode_offset; fdt_path_offset_namelen; - fdt_path_offset; - fdt_get_name; - fdt_get_property_namelen; - fdt_get_property; - fdt_getprop_namelen; - fdt_getprop; - fdt_get_phandle; - fdt_get_alias_namelen; - fdt_get_alias; - fdt_get_path; - fdt_supernode_atdepth_offset; - fdt_node_depth; - fdt_parent_offset; - fdt_node_offset_by_prop_value; - fdt_node_offset_by_phandle; - fdt_node_check_compatible; - fdt_node_offset_by_compatible; - fdt_setprop_inplace; - fdt_nop_property; - fdt_nop_node; - fdt_create; - fdt_add_reservemap_entry; - fdt_finish_reservemap; - fdt_begin_node; - fdt_property; - fdt_end_node; - fdt_finish; - fdt_open_into; - fdt_pack; - fdt_add_mem_rsv; - fdt_del_mem_rsv; - fdt_set_name; - fdt_setprop; - fdt_delprop; - fdt_add_subnode_namelen; - fdt_add_subnode; - fdt_del_node; - fdt_strerror; - fdt_offset_ptr; - fdt_next_tag; - fdt_appendprop; - fdt_create_empty_tree; - fdt_first_property_offset; - fdt_get_property_by_offset; - fdt_getprop_by_offset; - fdt_next_property_offset; + fdt_path_offset; + fdt_get_name; + fdt_get_property_namelen; + fdt_get_property; + fdt_getprop_namelen; + fdt_getprop; + fdt_get_phandle; + fdt_get_alias_namelen; + fdt_get_alias; + fdt_get_path; + fdt_supernode_atdepth_offset; + fdt_node_depth; + fdt_parent_offset; + fdt_node_offset_by_prop_value; + fdt_node_offset_by_phandle; + fdt_node_check_compatible; + fdt_node_offset_by_compatible; + fdt_setprop_inplace; + fdt_nop_property; + fdt_nop_node; + fdt_create; + fdt_add_reservemap_entry; + fdt_finish_reservemap; + fdt_begin_node; + fdt_property; + fdt_end_node; + fdt_finish; + fdt_open_into; + fdt_pack; + fdt_add_mem_rsv; + fdt_del_mem_rsv; + fdt_set_name; + fdt_setprop; + fdt_delprop; + fdt_add_subnode_namelen; + fdt_add_subnode; + fdt_del_node; + fdt_strerror; + fdt_offset_ptr; + fdt_next_tag; + fdt_appendprop; + fdt_create_empty_tree; + fdt_first_property_offset; + fdt_get_property_by_offset; + fdt_getprop_by_offset; + fdt_next_property_offset; fdt_first_subnode; fdt_next_subnode; fdt_address_cells; fdt_size_cells; fdt_stringlist_contains; fdt_resize; - - local: - *; -}; + + local: + *; +}; diff --git a/SecurityPkg/DeviceSecurity/SpdmLib/libspdm b/SecurityPkg/DeviceSecurity/SpdmLib/libspdm index 21d720c93a..50924a4c81 160000 --- a/SecurityPkg/DeviceSecurity/SpdmLib/libspdm +++ b/SecurityPkg/DeviceSecurity/SpdmLib/libspdm @@ -1 +1 @@ -Subproject commit 21d720c93a70c54b7c081e500b3ae6a5104d44a0 +Subproject commit 50924a4c8145fc721e17208f55814d2b38766fe6 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/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/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf index 00062fada4..73bbf7485c 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf @@ -101,7 +101,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