Remove the dead files.

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

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index dd4b712a0f3b1a57513c06a8412d582d04f3457b..c318283e28cb2323ff4951ac0cb1c579c594c7ab 100644 (file)
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -290,27972 +290,13598 @@
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</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
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Partition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="English" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIo" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIoPartition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SecurityStub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DxeMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="PeiMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="DxeIpl" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="GraphicsConsole" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Runtime" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="MonotonicCounter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Variable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="EmuVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="StatusCode" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiBaseMemoryTestInit" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PcdPeim" >\r
-        <PcdBuildDeclarations>\r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</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>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <DefaultValue>0x08</DefaultValue>\r
-            </PcdBuildData>           \r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+              <MaxDatumSize>4</MaxDatumSize>\r
+              <Value>0x08</Value>\r
+            </PcdData>           \r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</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>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <DefaultValue>0x10000000</DefaultValue>\r
-            </PcdBuildData>           \r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+                <MaxDatumSize>4</MaxDatumSize>\r
+                <Value>0x10000000</Value>\r
+            </PcdData>           \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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="WatchDogTimer" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="FtwLite" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DebugPort" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DebugSupport" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Terminal" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHubStdErr" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="NullMemoryTest" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="HiiDatabase" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ConSplitter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="BC" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Dhcp4" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SNP" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Ebc" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SetupBrowser" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DriverSample" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PciBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="AtapiPassThru" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="CirrusLogic5430UgaDraw" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="IdeBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="Uhci" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiDisk" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBot" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi0" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi1" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbKb" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMassStorage" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMouse" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       \r
       <!-- X64 -->\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Partition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="English" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIo" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIoPartition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SecurityStub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DxeMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="PeiMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="DxeIpl" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="GraphicsConsole" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Runtime" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="MonotonicCounter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Variable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="EmuVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="StatusCode" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiBaseMemoryTestInit" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PcdPeim" >\r
-        <PcdBuildDeclarations>\r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</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>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <DefaultValue>0x08</DefaultValue>\r
-            </PcdBuildData>           \r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+              <MaxDatumSize>4</MaxDatumSize>\r
+              <Value>0x08</Value>\r
+            </PcdData>           \r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</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>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <DefaultValue>0x10000000</DefaultValue>\r
-            </PcdBuildData>           \r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+                <MaxDatumSize>4</MaxDatumSize>\r
+                <Value>0x10000000</Value>\r
+            </PcdData>           \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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="WatchDogTimer" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="FtwLite" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DebugPort" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       <!--\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugSupport" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       -->\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Terminal" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHubStdErr" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="NullMemoryTest" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="HiiDatabase" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ConSplitter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="BC" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Dhcp4" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SNP" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Ebc" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SetupBrowser" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DriverSample" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PciBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="AtapiPassThru" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="CirrusLogic5430UgaDraw" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="IdeBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="Uhci" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiDisk" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBot" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi0" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi1" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbKb" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMassStorage" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMouse" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
 \r
       <!-- IPF -->\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Partition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="English" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIo" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIoPartition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SecurityStub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DxeMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="PeiMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="DxeIpl" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="GraphicsConsole" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Runtime" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="MonotonicCounter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Variable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="EmuVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="StatusCode" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiBaseMemoryTestInit" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PcdPeim" >\r
-        <PcdBuildDeclarations>\r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</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>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <DefaultValue>0x08</DefaultValue>\r
-            </PcdBuildData>           \r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+              <MaxDatumSize>4</MaxDatumSize>\r
+              <Value>0x08</Value>\r
+            </PcdData>           \r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</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>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <DefaultValue>0x10000000</DefaultValue>\r
-            </PcdBuildData>           \r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+                <MaxDatumSize>4</MaxDatumSize>\r
+                <Value>0x10000000</Value>\r
+            </PcdData>           \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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="WatchDogTimer" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="FtwLite" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DebugPort" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       <!--\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugSupport" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       -->   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Terminal" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHubStdErr" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="NullMemoryTest" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="HiiDatabase" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ConSplitter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="BC" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Dhcp4" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SNP" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Ebc" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SetupBrowser" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DriverSample" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PciBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="AtapiPassThru" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="CirrusLogic5430UgaDraw" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="IdeBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="Uhci" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiDisk" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBot" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi0" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi1" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbKb" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMassStorage" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMouse" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
 \r
       <!-- EBC -->\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HelloWorld" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Partition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="English" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIo" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DiskIoPartition" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SecurityStub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DxeMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="PeiMain" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="DxeIpl" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="GraphicsConsole" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       <!-- Not Support\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Runtime" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="MonotonicCounter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Variable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="EmuVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="StatusCode" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       --> \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PcdPeim" >\r
-        <PcdBuildDeclarations>\r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</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>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <DefaultValue>0x08</DefaultValue>\r
-            </PcdBuildData>           \r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+              <MaxDatumSize>4</MaxDatumSize>\r
+              <Value>0x08</Value>\r
+            </PcdData>           \r
+            <PcdData ItemType="FIXED_AT_BUILD">\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</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>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <DefaultValue>0x10000000</DefaultValue>\r
-            </PcdBuildData>           \r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+                <MaxDatumSize>4</MaxDatumSize>\r
+                <Value>0x10000000</Value>\r
+            </PcdData>           \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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PeiVariable" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="WatchDogTimer" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="FtwLite" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DebugPort" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       <!-- \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugSupport" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       -->    \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Terminal" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHub" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DataHubStdErr" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="NullMemoryTest" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="HiiDatabase" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ConSplitter" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="BC" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="Dhcp4" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="SNP" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       <!--\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Ebc" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
       -->     \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SetupBrowser" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="DriverSample" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="PciBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="AtapiPassThru" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="CirrusLogic5430UgaDraw" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="IdeBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\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="Uhci" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="ScsiDisk" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBot" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbBus" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi0" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbCbi1" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbKb" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMassStorage" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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="UsbMouse" >\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>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="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</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="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</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>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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</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
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</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
     </OTHER_COMPONENTS>\r
   </FrameworkModules>\r