Modify PCD declaration according to new schema.

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

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 2be9874ef8ce9c7afbcdb73bd24e2cc8e6d8f348..a363b6a665e7e7269fea2f685d51d7efacec97d0 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
@@ -85,6 +85,11 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
+\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
@@ -133,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
@@ -154,6 +159,10 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
   \r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
+\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiBootServicesTableLib" />\r
@@ -201,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
@@ -221,6 +230,10 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
+\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
   \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r
@@ -270,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
@@ -290,6 +303,10 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
+\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
   \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r
@@ -318,446 +335,230 @@
   <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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
@@ -782,104 +583,58 @@
       <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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -887,26 +642,16 @@
       </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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -914,7 +659,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
@@ -924,80 +669,44 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1020,47 +729,65 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\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
 \r
@@ -1073,8 +800,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
@@ -1084,114 +809,60 @@
       </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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1214,76 +885,40 @@
       </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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
@@ -1308,104 +943,58 @@
       <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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1413,26 +1002,16 @@
       </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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1440,7 +1019,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
@@ -1450,80 +1029,44 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1546,47 +1089,65 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\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
 \r
@@ -1599,8 +1160,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
@@ -1610,114 +1169,60 @@
       </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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1740,76 +1245,40 @@
       </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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
@@ -1834,104 +1303,58 @@
       <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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1939,26 +1362,16 @@
       </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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -1966,7 +1379,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
@@ -1976,80 +1389,44 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2072,47 +1449,65 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>       \r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\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
 \r
@@ -2125,8 +1520,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
@@ -2136,114 +1529,60 @@
       </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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2266,76 +1605,40 @@
       </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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\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
@@ -2360,104 +1663,58 @@
       <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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2465,26 +1722,16 @@
       </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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2492,7 +1739,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
@@ -2502,80 +1749,44 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2598,46 +1809,64 @@
       <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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
@@ -2651,8 +1880,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
@@ -2662,114 +1889,60 @@
       </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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\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
@@ -2793,188 +1966,6 @@
       \r
     </OTHER_COMPONENTS>  \r
   </FrameworkModules>\r
-  <PcdBuildDeclarations>\r
-    <PcdBuildData 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>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>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>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>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>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>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>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>10000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>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>0x80000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0xAF</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData 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
   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
   </BuildOptions>\r