Add the following Pcds declaration in EdkModulePkg.spd file. EdkModulePkg PeiVariable, RuntimeDxeVariabe, and Ftw module needs these PCDs.

PcdFlashNvStorageVariableBase
PcdFlashNvStorageVariableSize
PcdFlashNvStorageFtwSpareBase
PcdFlashNvStorageFtwSpareSize
PcdFlashNvStorageFtwWorkingBase
PcdFlashNvStorageFtwWorkingSize

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1454 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 195 insertions, 157 deletions

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 687db62936..f50f864253 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -1722,37 +1722,37 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0xAF</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

-          <Token>0x30000013</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFC0000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

-          <Token>0x30000014</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00010000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

-          <Token>0x30000010</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFBE000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

-          <Token>0x30000011</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00002000</Value>

+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
+          <Token>0x30000013</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
+          <Token>0x30000014</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
+          <Token>0x30000010</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
+          <Token>0x30000011</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
         </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

@@ -6370,37 +6370,37 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0xAF</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

-          <Token>0x30000013</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFC0000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

-          <Token>0x30000014</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00010000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

-          <Token>0x30000010</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFBE000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

-          <Token>0x30000011</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00002000</Value>

+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
+          <Token>0x30000013</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
+          <Token>0x30000014</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
+          <Token>0x30000010</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
+          <Token>0x30000011</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
         </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

@@ -10394,37 +10394,37 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0xAF</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

-          <Token>0x30000013</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFC0000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

-          <Token>0x30000014</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00010000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

-          <Token>0x30000010</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFBE000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

-          <Token>0x30000011</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00002000</Value>

+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
+          <Token>0x30000013</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
+          <Token>0x30000014</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
+          <Token>0x30000010</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
+          <Token>0x30000011</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
         </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

@@ -14061,37 +14061,37 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0xAF</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

-          <Token>0x30000013</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFC0000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

-          <Token>0x30000014</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00010000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

-          <Token>0x30000010</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0xFFFBE000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

-          <Token>0x30000011</Token>

-          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x00002000</Value>

+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
+          <Token>0x30000013</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
+          <Token>0x30000014</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
+          <Token>0x30000010</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
+          <Token>0x30000011</Token>
+          <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
         </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index cf6a991761..6359d649e8 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -995,28 +995,6 @@
       <HelpText>Maximun number of performance log entries during PEI phase.</HelpText>

     </PcdEntry>

     <PcdEntry>

-      <C_Name>PcdFlashFvBaseArray</C_Name>

-      <Token>0x31000001</Token>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <DatumType>VOID*</DatumType>

-      <ValidUsage>DYNAMIC</ValidUsage>

-      <DefaultValue>{}</DefaultValue>

-      <HelpText>This PCD is a array of EFI_PHYSICAL_ADDERSS of each Firmware Volume on the
-      platform. FVB driver will make use of this PCD entry to install EFI_FIRMWARE_BLOCK_PROTOCOL
-      on every FV specified.</HelpText>

-    </PcdEntry>

-    <PcdEntry>

-      <C_Name>PcdFlashFvBaseArrayElementNumber</C_Name>

-      <Token>0x32000002</Token>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <DatumType>UINT8</DatumType>

-      <ValidUsage>DYNAMIC</ValidUsage>

-      <DefaultValue>3</DefaultValue>

-      <HelpText>This PCD is a number element in the array defined by PcdFlashFvBaseArray in
-      gEfiGenericPlatformTokenSpaceGuid. Normally, we have 3 firmware volumes:
-      FV_MAIN, FV_RECOVERY, NV_STORAGE.</HelpText>

-    </PcdEntry>

-    <PcdEntry>

       <C_Name>PcdPeiPcdDatabaseSetEnabled</C_Name>

       <Token>0x00010030</Token>

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -1052,5 +1030,59 @@
       <DefaultValue>FALSE</DefaultValue>

       <HelpText>This feature flag can be used to enable or disable the PCD service PEIM to handle DynamicEX PCD. If a platform has no module to use DynamicEX  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>

     </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageVariableBase</C_Name>

+      <Token>0x30000001</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0xFFFB0000</DefaultValue>

+      <HelpText>Base address of the variable section in NV firmware volume.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageVariableSize</C_Name>

+      <Token>0x30000002</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0x0000A000</DefaultValue>

+      <HelpText>Size of the variable section in NV firmware volume..</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

+      <Token>0x30000013</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0xFFFC0000</DefaultValue>

+      <HelpText>Base address of the FTW spare block section in NV firmware volume.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

+      <Token>0x30000014</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0x00010000</DefaultValue>

+      <HelpText>Size of the FTW spare block section in NV firmware volume.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

+      <Token>0x30000010</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0xFFFBE000</DefaultValue>

+      <HelpText>Base address of the FTW working block section in NV firmware volume.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

+      <Token>0x30000011</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>

+      <DefaultValue>0x00002000</DefaultValue>

+      <HelpText>Size of the FTW working block section in NV firmware volume.</HelpText>

+    </PcdEntry>

   </PcdDeclarations>

 </PackageSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index 3505b5eef3..27d5f61e40 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -100,22 +100,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>

   </Externs>

   <PcdCoded>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get base address of the FTW spare block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get size of the FTW spare block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get base address of the FTW working block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get size of the FTW working block section in NV firmware volume.</HelpText>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 049ee3731d..99c34e400f 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -166,8 +166,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       <C_Name>PcdFlashNvStorageVariableSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>

-        The driver gets the Variable store base address from this PCD.  This base address point to

-        an EFI_FIRMWARE_VOLUMN_HEADER struct.

+        The driver gets the NvStorage Variable Size from this PCD.

       </HelpText>      

     </PcdEntry>     

   </PcdCoded>  

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index 1a098cf057..7c121fc372 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -103,25 +103,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
         normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.

       </HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC">

+      <C_Name>PcdFlashNvStorageVariableSize</C_Name>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>

+        To get the NvStorage Variable size from this PCD.

+      </HelpText>

+    </PcdEntry>

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get base address of the FTW spare block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get size of the FTW spare block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get base address of the FTW working block section in NV firmware volume.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>To get size of the FTW working block section in NV firmware volume.</HelpText>

-    </PcdEntry>    

+    </PcdEntry>

   </PcdCoded>

 </ModuleSurfaceArea>