UefiCpuPkg: Remove double \r

[mirror_edk2.git] / Nt32Pkg / FvbServicesRuntimeDxe / FvbInfo.c

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
index e05e205aae9639e0c0cbad1e70487aa7769febea..1b4d08282863579a2dbb1ef9cdc0a278a1317ea1 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -1,13 +1,7 @@
 /**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 Module Name:\r
 \r
@@ -32,7 +26,6 @@ Abstract:
 #include <Guid/FirmwareFileSystem2.h>\r
 #include <Guid/SystemNvDataGuid.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r
-#include <Guid/AlternateFvBlock.h>\r
 #include <Protocol/DevicePath.h>\r
 //\r
 // The Library classes this module consumes\r
@@ -71,18 +64,20 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       EFI_FIRMWARE_FILE_SYSTEM2_GUID,\r
       FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),\r
       EFI_FVH_SIGNATURE,\r
-      EFI_FVB2_READ_ENABLED_CAP |\r
+      EFI_FVB2_MEMORY_MAPPED |  \r
+        EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
         EFI_FVB2_WRITE_ENABLED_CAP |\r
         EFI_FVB2_WRITE_STATUS |\r
-        EFI_FVB2_ERASE_POLARITY,\r
+        EFI_FVB2_ERASE_POLARITY |\r
+        EFI_FVB2_ALIGNMENT_16,\r
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
-      0,  // CheckSum\r
-      0,  // ExtHeaderOffset\r
+      0xE947,   // CheckSum\r
+      0,        // ExtHeaderOffset\r
       {\r
         0,\r
       },  // Reserved[1]\r
-      1,  // Revision\r
+      2,  // Revision\r
       {\r
         FixedPcdGet32 (PcdWinNtFlashFvRecoverySize)/FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
         FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
@@ -111,18 +106,20 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
       FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),\r
       EFI_FVH_SIGNATURE,\r
-      EFI_FVB2_READ_ENABLED_CAP |\r
+      EFI_FVB2_MEMORY_MAPPED |  \r
+        EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
         EFI_FVB2_WRITE_ENABLED_CAP |\r
         EFI_FVB2_WRITE_STATUS |\r
-        EFI_FVB2_ERASE_POLARITY,\r
+        EFI_FVB2_ERASE_POLARITY |\r
+        EFI_FVB2_ALIGNMENT_16,\r
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),\r
-      0,  // CheckSum\r
-      0,  // ExtHeaderOffset\r
+      0xFBFF,  // CheckSum\r
+      0,       // ExtHeaderOffset\r
       {\r
         0,\r
       },  // Reserved[1]\r
-      1,  // Revision\r
+      2,  // Revision\r
       {\r
        (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
         FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r