X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Nt32Pkg%2FFvbServicesRuntimeDxe%2FFvbInfo.c;h=b39cd2ea912868714d9326ad64f1699b1ddb23e7;hb=d70b88120a2b5e98d00c722b54b0c39b06c23710;hp=25df9522792172b2678f2552e2270994f04b241e;hpb=55e6660f6b4652dcac70ae5eb312a3cd2c96733d;p=mirror_edk2.git

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
index 25df952279..b39cd2ea91 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -1,4 +1,4 @@
-/*++
+/**@file
 
 Copyright (c) 2006, Intel Corporation                                                         
 All rights reserved. This program and the accompanying materials                          
@@ -18,7 +18,7 @@ Abstract:
   Defines data structure that is the volume header found.These data is intent
   to decouple FVB driver with FV header.
 
---*/
+**/
 
 //
 // The package level header files this module uses
@@ -31,9 +31,7 @@ Abstract:
 #include <Guid/EventGroup.h>
 #include <Guid/FirmwareFileSystem2.h>
 #include <Guid/SystemNvDataGuid.h>
-#include <Protocol/FvbExtension.h>
 #include <Protocol/FirmwareVolumeBlock.h>
-#include <Guid/AlternateFvBlock.h>
 #include <Protocol/DevicePath.h>
 //
 // The Library classes this module consumes
@@ -48,10 +46,7 @@ Abstract:
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
-
-#include "FlashLayout.h"
-
-#define FIRMWARE_BLOCK_SIZE 0x10000
+#include <Library/PcdLib.h>
 
 typedef struct {
   UINT64                      FvLength;
@@ -62,38 +57,36 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY      End[1];
 } EFI_FVB_MEDIA_INFO;
 
-#define FVB_MEDIA_BLOCK_SIZE    FIRMWARE_BLOCK_SIZE
-#define RECOVERY_BOIS_BLOCK_NUM FIRMWARE_BLOCK_NUMBER
-#define SYSTEM_NV_BLOCK_NUM     2
-
 EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
   //
   // Recovery BOIS FVB
   //
   {
-    EFI_WINNT_FIRMWARE_LENGTH,
+    FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),
     {
       {
         0,
       },  // ZeroVector[16]
       EFI_FIRMWARE_FILE_SYSTEM2_GUID,
-      FVB_MEDIA_BLOCK_SIZE * RECOVERY_BOIS_BLOCK_NUM,
+      FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),
       EFI_FVH_SIGNATURE,
-      EFI_FVB2_READ_ENABLED_CAP |
+      EFI_FVB2_MEMORY_MAPPED |  
+        EFI_FVB2_READ_ENABLED_CAP |
         EFI_FVB2_READ_STATUS |
         EFI_FVB2_WRITE_ENABLED_CAP |
         EFI_FVB2_WRITE_STATUS |
-        EFI_FVB2_ERASE_POLARITY,
+        EFI_FVB2_ERASE_POLARITY |
+        EFI_FVB2_ALIGNMENT_16,
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),
-      0,  // CheckSum
-      0,  // ExtHeaderOffset
+      0xE947,   // CheckSum
+      0,        // ExtHeaderOffset
       {
         0,
       },  // Reserved[1]
-      1,  // Revision
+      2,  // Revision
       {
-        RECOVERY_BOIS_BLOCK_NUM,
-        FVB_MEDIA_BLOCK_SIZE,
+        FixedPcdGet32 (PcdWinNtFlashFvRecoverySize)/FixedPcdGet32 (PcdWinNtFirmwareBlockSize),
+        FixedPcdGet32 (PcdWinNtFirmwareBlockSize),
       }
     },
     {
@@ -105,29 +98,40 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
   // Systen NvStorage FVB
   //
   {
-    EFI_WINNT_RUNTIME_UPDATABLE_LENGTH + EFI_WINNT_FTW_SPARE_BLOCK_LENGTH,
+    FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
+    FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
+    FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
+    FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),
     {
       {
         0,
       },  // ZeroVector[16]
-      EFI_SYSTEM_NV_DATA_HOB_GUID,
-      FVB_MEDIA_BLOCK_SIZE * SYSTEM_NV_BLOCK_NUM,
+      EFI_SYSTEM_NV_DATA_FV_GUID,
+      FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
+      FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
+      FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
+      FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),
       EFI_FVH_SIGNATURE,
-      EFI_FVB2_READ_ENABLED_CAP |
+      EFI_FVB2_MEMORY_MAPPED |  
+        EFI_FVB2_READ_ENABLED_CAP |
         EFI_FVB2_READ_STATUS |
         EFI_FVB2_WRITE_ENABLED_CAP |
         EFI_FVB2_WRITE_STATUS |
-        EFI_FVB2_ERASE_POLARITY,
+        EFI_FVB2_ERASE_POLARITY |
+        EFI_FVB2_ALIGNMENT_16,
       sizeof (EFI_FIRMWARE_VOLUME_HEADER) + sizeof (EFI_FV_BLOCK_MAP_ENTRY),
-      0,  // CheckSum
-      0,  // ExtHeaderOffset
+      0xFBFF,  // CheckSum
+      0,       // ExtHeaderOffset
       {
         0,
       },  // Reserved[1]
-      1,  // Revision
+      2,  // Revision
       {
-        SYSTEM_NV_BLOCK_NUM,
-        FVB_MEDIA_BLOCK_SIZE,
+       (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
+        FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
+        FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
+        FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdWinNtFirmwareBlockSize),
+        FixedPcdGet32 (PcdWinNtFirmwareBlockSize),
       }
     },
     {