Add in HII enable support for PCD.

[mirror_edk2.git] / MdePkg / MdePkg-All-Archs.fpd

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index b12e506c8dfc8a2906a899574291daafa0d553ae..62aee07ae56ab33375b5f6e4d1f7b110a1d520b8 100644 (file)
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -65,7 +65,7 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
@@ -138,7 +138,7 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
@@ -210,7 +210,7 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
@@ -283,7 +283,7 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
@@ -335,446 +335,206 @@
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
@@ -799,104 +559,53 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
@@ -904,26 +613,15 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
@@ -931,7 +629,7 @@
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
@@ -941,80 +639,40 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
@@ -1037,109 +695,59 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>                \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
@@ -1153,8 +761,6 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
@@ -1164,114 +770,54 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
@@ -1294,76 +840,36 @@
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
@@ -1388,104 +894,53 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
@@ -1493,26 +948,15 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
@@ -1520,7 +964,7 @@
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
@@ -1530,80 +974,40 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
@@ -1626,109 +1030,59 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>                \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
@@ -1742,8 +1096,6 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
@@ -1753,114 +1105,54 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
@@ -1883,76 +1175,36 @@
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
@@ -1977,104 +1229,53 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
@@ -2082,26 +1283,15 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
@@ -2109,7 +1299,7 @@
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
@@ -2119,80 +1309,40 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
@@ -2215,109 +1365,59 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>         \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
@@ -2331,8 +1431,6 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
@@ -2342,114 +1440,54 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
@@ -2472,76 +1510,36 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
@@ -2566,104 +1564,53 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
@@ -2671,26 +1618,15 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
@@ -2698,7 +1634,7 @@
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
@@ -2708,80 +1644,40 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
@@ -2804,109 +1700,59 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
@@ -2920,8 +1766,6 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
@@ -2931,114 +1775,54 @@
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r