Import edk2-stable202005vendor/edk2/ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9vendor/edk2

As with the previous import, only the MdePkg subdirectory has been
brought in. The line-endings were also converted using:

% find . -type f | xargs -n 1 sed -I.BAK -e `printf "s/\r//g"`
% find . -name \*.BAK | xargs rm

3 files changed, 15 insertions, 34 deletions

diff --git a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
index 75995d2edd55..d1b0c793f2b6 100644
--- a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
+++ b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
@@ -1,18 +1,12 @@
 ## @file
 # Instance of S3 PCI Library based on PCI and S3 BootScript Library.
 #
-# S3 PCI Services that perform PCI Configuration cycles and 
+# S3 PCI Services that perform PCI Configuration cycles and
 # also enable the PCI operation to be replayed during an S3 resume.
 #
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are
-# licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
@@ -23,13 +17,13 @@
   FILE_GUID                      = F66B6BD2-513F-441d-B367-2D5BD4998A50
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = S3PciLib 
+  LIBRARY_CLASS                  = S3PciLib
 
 
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#  VALID_ARCHITECTURES           = IA32 X64 EBC
 #
 
 [Sources]
diff --git a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
index 1ca4d8ff748f..8f4bde013369 100644
--- a/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
+++ b/MdePkg/Library/BaseS3PciLib/BaseS3PciLib.uni
@@ -4,15 +4,9 @@
 // S3 PCI Services that perform PCI Configuration cycles and
 // also enable the PCI operation to be replayed during an S3 resume.
 //
-// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 //
-// This program and the accompanying materials are
-// licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution.  The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-// 
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 // **/
 
diff --git a/MdePkg/Library/BaseS3PciLib/S3PciLib.c b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
index a2f956bee14e..d790f54a14b9 100644
--- a/MdePkg/Library/BaseS3PciLib/S3PciLib.c
+++ b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
@@ -1,18 +1,11 @@
 /** @file
   PCI configuration Library Services that do PCI configuration and also enable
   the PCI operations to be replayed during an S3 resume. This library class
-  maps directly on top of the PciLib class. 
+  maps directly on top of the PciLib class.
 
-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions
-  of the BSD License which accompanies this distribution.  The
-  full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -31,7 +24,7 @@
   Saves a PCI configuration value to the boot script.
 
   This internal worker function saves a PCI configuration value in
-  the S3 script to be replayed on S3 resume. 
+  the S3 script to be replayed on S3 resume.
 
   If the saving process fails, then ASSERT().
 
@@ -63,7 +56,7 @@ InternalSavePciWriteValueToBootScript (
   Saves an 8-bit PCI configuration value to the boot script.
 
   This internal worker function saves an 8-bit PCI configuration value in
-  the S3 script to be replayed on S3 resume. 
+  the S3 script to be replayed on S3 resume.
 
   If the saving process fails, then ASSERT().
 
@@ -429,7 +422,7 @@ S3PciBitFieldAndThenOr8 (
   Saves a 16-bit PCI configuration value to the boot script.
 
   This internal worker function saves a 16-bit PCI configuration value in
-  the S3 script to be replayed on S3 resume. 
+  the S3 script to be replayed on S3 resume.
 
   If the saving process fails, then ASSERT().
 
@@ -805,7 +798,7 @@ S3PciBitFieldAndThenOr16 (
   Saves a 32-bit PCI configuration value to the boot script.
 
   This internal worker function saves a 32-bit PCI configuration value in the S3 script
-  to be replayed on S3 resume. 
+  to be replayed on S3 resume.
 
   If the saving process fails, then ASSERT().
 
@@ -1264,6 +1257,6 @@ S3PciWriteBuffer (
              Buffer
              );
   ASSERT (Status == RETURN_SUCCESS);
-  
+
   return Size;
 }