X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FEdkModulePkg.spd;h=c449fd457441aa8b5ce088829db5b61f259d17fe;hp=48f49279acf57e62574287e17c9ccc987136cba8;hb=6d8597dcf07d9af670966a51333b53aa8e06f4ed;hpb=f89f5802f82b1b83f85a074fc0f76ec782e003b5

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 48f49279ac..c449fd4574 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -812,6 +812,7 @@
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x08</DefaultValue>
       <HelpText>The maximum number of callback function, which will be triggered when 
         a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>
     </PcdEntry>
@@ -821,31 +822,35 @@
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x0</DefaultValue>
       <HelpText>The base address of the VPD (Vital Product Data) region. It is 
         normally a region reserved on flash.</HelpText>
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdSupportUpdateCapsuleRest</C_Name>
-      <Token>0x00010020</Token>
+      <Token>0x0001001d</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
+      <DefaultValue>FALSE</DefaultValue>
       <HelpText>Indicate whether platform can support update capsule across a system reset</HelpText>
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdMaxSizePopulateCapsule</C_Name>
-      <Token>0x00010021</Token>
+      <Token>0x0001001e</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x0</DefaultValue>
       <HelpText>Indicate the max size the platform can support in case of populated capsules</HelpText>
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>
-      <Token>0x00010022</Token>
+      <Token>0x0001001f</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
+      <DefaultValue>0x0</DefaultValue>
       <HelpText>Indicate the max size the platform can support in case of non-populated capsules</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -900,8 +905,8 @@
       <Token>0x00010025</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT16</DatumType>
-      <ValidUsage>DYNAMIC</ValidUsage>
-      <DefaultValue>4</DefaultValue>
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
+      <DefaultValue>1</DefaultValue>
       <HelpText>kbytes size of GUID'ed HOB, if the GUID'ed HOB is full, create new GUID'ed HOB with this size.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -981,7 +986,7 @@
       <Token>0x0001002e</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT16</DatumType>
-      <ValidUsage>DYNAMIC</ValidUsage>
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE DYNAMIC</ValidUsage>
       <DefaultValue>4</DefaultValue>
       <HelpText>kbytes size of runtime memory.</HelpText>
     </PcdEntry>
@@ -994,35 +999,13 @@
       <DefaultValue>28</DefaultValue>
       <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>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
+      <DefaultValue>TRUE</DefaultValue>
       <HelpText>This feature flag can be used to enable or disable the SET capability of PCD service PEIM. If a platform does not do PCD SET operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -1031,7 +1014,7 @@
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
+      <DefaultValue>TRUE</DefaultValue>
       <HelpText>This feature flag can be used to enable or disable the GET size capability of PCD service PEIM. If a platform does not do PCD get size operation in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -1040,7 +1023,7 @@
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
+      <DefaultValue>TRUE</DefaultValue>
       <HelpText>This feature flag can be used to enable or disable the Callback On SET capability of PCD service PEIM. If a platform does not register any callback on set  in PEI phase. This flag can be set to DISABLE to save size.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -1049,8 +1032,62 @@
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
+      <DefaultValue>TRUE</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>0x0</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>0x0</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>0x0</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>0x0</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>0x0</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>0x0</DefaultValue>
+      <HelpText>Size of the FTW working block section in NV firmware volume.</HelpText>
+    </PcdEntry>
   </PcdDeclarations>
 </PackageSurfaceArea>
\ No newline at end of file