UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / EmulatorPkg / FirmwareVolumePei / FirmwareVolumePei.c

diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
index ec9fe5c0b73488c7f51994c18a45738bfe2d5e4a..12b223e32173d8b050f3fec38c57960c2a7453d6 100644 (file)
--- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
@@ -2,13 +2,7 @@
 \r
 Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011, Apple Inc. All rights reserved.\r
-This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -24,18 +18,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializeFirmwareVolumePei (\r
-  IN       EFI_PEI_FILE_HANDLE       FileHandle,\r
-  IN CONST EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
+\r
 /*++\r
 \r
 Routine Description:\r
   Perform a call-back into the SEC simulator to get address of the Firmware Hub\r
 \r
 Arguments:\r
-  FfsHeader   - Ffs Header availible to every PEIM\r
+  FfsHeader   - Ffs Header available to every PEIM\r
   PeiServices - General purpose services available to every PEIM.\r
-    \r
+\r
 Returns:\r
   None\r
 \r
@@ -50,17 +45,17 @@ Returns:
   UINT64                      FdSize;\r
   UINTN                       Index;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Unix Firmware Volume PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "Unix Firmware Volume PEIM Loaded\n"));\r
 \r
   //\r
   // Get the Fwh Information PPI\r
   //\r
   Status = PeiServicesLocatePpi (\r
-              &gEmuThunkPpiGuid,  // GUID\r
-              0,                  // INSTANCE\r
-              &PpiDescriptor,     // EFI_PEI_PPI_DESCRIPTOR\r
-              (VOID **)&Thunk     // PPI\r
-              );\r
+             &gEmuThunkPpiGuid,   // GUID\r
+             0,                   // INSTANCE\r
+             &PpiDescriptor,      // EFI_PEI_PPI_DESCRIPTOR\r
+             (VOID **)&Thunk      // PPI\r
+             );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Index = 0;\r
@@ -73,7 +68,7 @@ Returns:
       //\r
       // Assume the FD starts with an FV header\r
       //\r
-      FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FdBase;\r
+      FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FdBase;\r
 \r
       //\r
       // Make an FV Hob for the first FV in the FD\r
@@ -90,20 +85,20 @@ Returns:
           EFI_RESOURCE_FIRMWARE_DEVICE,\r
           (EFI_RESOURCE_ATTRIBUTE_PRESENT | EFI_RESOURCE_ATTRIBUTE_INITIALIZED | EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE),\r
           FdBase,\r
-          ( \r
-            FvHeader->FvLength + \r
-            PcdGet32 (PcdFlashNvStorageVariableSize) +\r
-            PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
-            PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
-            PcdGet32 (PcdEmuFlashNvStorageEventLogSize)\r
+          (\r
+           FvHeader->FvLength +\r
+           PcdGet32 (PcdFlashNvStorageVariableSize) +\r
+           PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+           PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+           PcdGet32 (PcdEmuFlashNvStorageEventLogSize)\r
           )\r
-        );\r
+          );\r
 \r
         //\r
         // Hard code the address of the spare block and variable services.\r
         //  Assume it's a hard coded offset from FV0 in FD0.\r
         //\r
-        FdSize  = \r
+        FdSize =\r
           PcdGet32 (PcdFlashNvStorageVariableSize) +\r
           PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
           PcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r