Replace the FlashMapHob with PCD defined in FDF on Nt32 platform. Currently, the...

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

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
index 25df9522792172b2678f2552e2270994f04b241e..f455567a490c7027571cc74b23c08a9e0c5daf8c 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -48,10 +48,7 @@ Abstract:
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
-\r
-#include "FlashLayout.h"\r
-\r
-#define FIRMWARE_BLOCK_SIZE 0x10000\r
+#include <Library/PcdLib.h>\r
 \r
 typedef struct {\r
   UINT64                      FvLength;\r
@@ -62,22 +59,18 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY      End[1];\r
 } EFI_FVB_MEDIA_INFO;\r
 \r
-#define FVB_MEDIA_BLOCK_SIZE    FIRMWARE_BLOCK_SIZE\r
-#define RECOVERY_BOIS_BLOCK_NUM FIRMWARE_BLOCK_NUMBER\r
-#define SYSTEM_NV_BLOCK_NUM     2\r
-\r
 EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {\r
   //\r
   // Recovery BOIS FVB\r
   //\r
   {\r
-    EFI_WINNT_FIRMWARE_LENGTH,\r
+    FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),\r
     {\r
       {\r
         0,\r
       },  // ZeroVector[16]\r
       EFI_FIRMWARE_FILE_SYSTEM2_GUID,\r
-      FVB_MEDIA_BLOCK_SIZE * RECOVERY_BOIS_BLOCK_NUM,\r
+      FixedPcdGet32 (PcdWinNtFlashFvRecoverySize),\r
       EFI_FVH_SIGNATURE,\r
       EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
@@ -92,8 +85,8 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[1]\r
       1,  // Revision\r
       {\r
-        RECOVERY_BOIS_BLOCK_NUM,\r
-        FVB_MEDIA_BLOCK_SIZE,\r
+        FixedPcdGet32 (PcdWinNtFlashFvRecoverySize)/FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
+        FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
       }\r
     },\r
     {\r
@@ -105,13 +98,19 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
   // Systen NvStorage FVB\r
   //\r
   {\r
-    EFI_WINNT_RUNTIME_UPDATABLE_LENGTH + EFI_WINNT_FTW_SPARE_BLOCK_LENGTH,\r
+    FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
+    FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+    FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+    FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),\r
     {\r
       {\r
         0,\r
       },  // ZeroVector[16]\r
       EFI_SYSTEM_NV_DATA_HOB_GUID,\r
-      FVB_MEDIA_BLOCK_SIZE * SYSTEM_NV_BLOCK_NUM,\r
+      FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
+      FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+      FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+      FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize),\r
       EFI_FVH_SIGNATURE,\r
       EFI_FVB2_READ_ENABLED_CAP |\r
         EFI_FVB2_READ_STATUS |\r
@@ -126,8 +125,11 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[1]\r
       1,  // Revision\r
       {\r
-        SYSTEM_NV_BLOCK_NUM,\r
-        FVB_MEDIA_BLOCK_SIZE,\r
+       (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r
+        FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +\r
+        FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +\r
+        FixedPcdGet32 (PcdWinNtFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
+        FixedPcdGet32 (PcdWinNtFirmwareBlockSize),\r
       }\r
     },\r
     {\r