Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed line ending errors in several files #75

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions EmbeddedPkg/Library/FdtLib/Makefile.libfdt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
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_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)
120 changes: 60 additions & 60 deletions EmbeddedPkg/Library/FdtLib/version.lds
Original file line number Diff line number Diff line change
@@ -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:
*;
};
10 changes: 5 additions & 5 deletions SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
PlatformSecureLib
VariablePolicyLib

#MU_CHANGE START TCBZ2506
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdEnforceSelfsignedPk
# MU_CHANGE END

#MU_CHANGE START TCBZ2506
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdEnforceSelfsignedPk
# MU_CHANGE END
[Guids]
## CONSUMES ## Variable:L"SetupMode"
## PRODUCES ## Variable:L"SetupMode"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
HobLib
Tpm2CommandLib
Tcg2PpVendorLib
Tcg2PhysicalPresencePromptLib ## MS_CHANGE
Tcg2PhysicalPresencePromptLib ## MS_CHANGE

[Protocols]
gEfiTcg2ProtocolGuid ## SOMETIMES_CONSUMES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#string TPM_PPI_HEAD_STR #language en-US "A configuration change was requested to allow the Operating System to %s the computer's TPM (Trusted Platform Module) without asking for user confirmation in the future.\n\n"

#string TPM_ACCEPT_KEY #language en-US "Press F10 "
/**
MS_CHANGE_70401
MSChange [BEGIN] - Alter the strings to reflect the new dialog box.
**/
#string TPM_CAUTION_KEY #language en-US "Press OK "
#string TPM_REJECT_KEY #language en-US "to %s the TPM \nPress CANCEL to reject this change request and continue\n"
/**
MSChange [END]
**/
/**
MS_CHANGE_70401
MSChange [BEGIN] - Alter the strings to reflect the new dialog box.
**/
#string TPM_CAUTION_KEY #language en-US "Press OK "
#string TPM_REJECT_KEY #language en-US "to %s the TPM \nPress CANCEL to reject this change request and continue\n"
/**
MSChange [END]
**/

#string TPM_ENABLE #language en-US "enable"
#string TPM_DISABLE #language en-US "disable"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,8 +40,8 @@
MemoryAllocationLib
BaseCryptLib

[Pcd]
gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE

[Pcd]
gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE
[Guids]
gEfiCertPkcs7Guid ## CONSUMES ## GUID
6 changes: 3 additions & 3 deletions SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
# used for every TPM 2.0 command. Choosing this library means platform uses and
# only uses TPM 2.0 DTPM device.
#
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent
# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
Expand Down Expand Up @@ -51,7 +51,7 @@
TimerLib
DebugLib
PcdLib
Tpm2DebugLib ## MS_CHANGE
Tpm2DebugLib ## MS_CHANGE

[Pcd]
gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
TimerLib
DebugLib
PcdLib
Tpm2DebugLib ## MS_CHANGE
Tpm2DebugLib ## MS_CHANGE

[Pcd]
gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
TimerLib
DebugLib
PcdLib
Tpm2DebugLib ## MS_CHANGE
Tpm2DebugLib ## MS_CHANGE

[Pcd]
gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## CONSUMES
Expand Down
8 changes: 4 additions & 4 deletions SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions SecurityPkg/Tcg/Tcg2Acpi/Tpm.asl
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ DefinitionBlock (

Method (PTS, 1, Serialized)
{
#if 0 // MS_CHANGE Begin - Remove MOR auto-detect from TPM.PTS
#if 0 // MS_CHANGE Begin - Remove MOR auto-detect from TPM.PTS
//
// Detect Sx state for MOR, only S4, S5 need to handle
//
Expand All @@ -262,7 +262,7 @@ DefinitionBlock (
Store (MCIN, IOPN)
}
}
#endif // MS_CHANGE End
#endif // MS_CHANGE End
Return (0)
}

Expand Down Expand Up @@ -448,7 +448,7 @@ DefinitionBlock (
Return (1)
}

#if 0 // MS_CHANGE Begin - Remove support for _DSM Memory Clear
#if 0 // MS_CHANGE Begin - Remove support for _DSM Memory Clear
Method (TMCI, 2, Serialized, 0, IntObj, {UnknownObj, UnknownObj}) // IntObj, PkgObj
{
//
Expand Down Expand Up @@ -485,7 +485,7 @@ DefinitionBlock (
}
Return (1)
}
#endif // MS_CHANGE End
#endif // MS_CHANGE End

Method (_DSM, 4, Serialized, 0, UnknownObj, {BuffObj, IntObj, IntObj, PkgObj})
{
Expand All @@ -506,17 +506,17 @@ DefinitionBlock (
Return (TPPI (Arg2, Arg3))
}

// MS_CHANGE Begin - Remove support for _DSM memory clear
/*
// MS_CHANGE Begin - Remove support for _DSM memory clear
/*
//
// TCG Memory Clear Interface
//
If(LEqual(Arg0, ToUUID ("376054ed-cc13-4675-901c-4756d7f2d45d")))
{
Return (TMCI (Arg2, Arg3))
}
*/
// MS_CHANGE End
*/
// MS_CHANGE End

Return (Buffer () {0})
}
Expand Down
18 changes: 9 additions & 9 deletions SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# buffer overflow, integer overflow.
#
# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2016, Microsoft Corporation
#
# Copyright (c) 2016, Microsoft Corporation
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
Expand Down Expand Up @@ -66,11 +66,11 @@
ReportStatusCodeLib
Tcg2PhysicalPresenceLib
PeCoffLib
## MS_CHANGE_23086
## MSChange [BEGIN] - Add the OemTpm2InitLib
OemTpm2InitLib
## MSChange [END]
PcdLib # MU_CHANGE
## MS_CHANGE_23086
## MSChange [BEGIN] - Add the OemTpm2InitLib
OemTpm2InitLib
## MSChange [END]
PcdLib # MU_CHANGE

[Guids]
## SOMETIMES_CONSUMES ## Variable:L"SecureBoot"
Expand All @@ -96,7 +96,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
Expand All @@ -115,7 +115,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml ## PRODUCES
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa ## PRODUCES
gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision ## CONSUMES
gEfiSecurityPkgTokenSpaceGuid.TcgMeasureBootStringsInPcr4 ## CONSUMES # MU_CHANGE
gEfiSecurityPkgTokenSpaceGuid.TcgMeasureBootStringsInPcr4 ## CONSUMES # MU_CHANGE

[Depex]
# According to PcdTpm2AcpiTableRev definition in SecurityPkg.dec
Expand Down