]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Modify PCD tool according to final PCD schema modification.
authorklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 12 Jun 2006 07:57:04 +0000 (07:57 +0000)
committerklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 12 Jun 2006 07:57:04 +0000 (07:57 +0000)
1) Change code of PCD tools.
2) Update all FPD file.
3) Fix some bugs in FPD for wrong DatumSize.

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

14 files changed:
EdkModulePkg/EdkModulePkg-All-Archs.fpd
EdkModulePkg/EdkModulePkg.fpd
EdkNt32Pkg/Nt32.fpd
MdePkg/MdePkg-All-Archs.fpd
MdePkg/MdePkg.fpd
Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java [new file with mode: 0644]
Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java

index dd4b712a0f3b1a57513c06a8412d582d04f3457b..f72403046f7e52c22e51caacb6a478a14cf1b5e1 100644 (file)
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\r
   <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
       </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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIpl" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="GraphicsConsole" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Runtime" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="MonotonicCounter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Variable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="EmuVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="StatusCode" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PcdPeim" >\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
               <DatumType>UINT32</DatumType>\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</Token>\r
               <DatumType>UINT32</DatumType>\r
-              <HiiEnable>false</HiiEnable>\r
-              <VpdEnable>false</VpdEnable>\r
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-              <SkuEnable>false</SkuEnable>\r
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-              <MaxSku>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <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
                 <DatumType>UINT32</DatumType>\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</Token>\r
                 <DatumType>UINT32</DatumType>\r
-                <HiiEnable>false</HiiEnable>\r
-                <VpdEnable>false</VpdEnable>\r
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-                <SkuEnable>false</SkuEnable>\r
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-                <MaxSku>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="WatchDogTimer" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="FtwLite" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Terminal" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHubStdErr" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="NullMemoryTest" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiDatabase" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ConSplitter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BC" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Dhcp4" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SNP" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Ebc" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SetupBrowser" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DriverSample" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PciBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="AtapiPassThru" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="IdeBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Uhci" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiDisk" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBot" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi0" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi1" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbKb" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       \r
       <!-- X64 -->\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Partition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="English" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIo" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeIpl" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="GraphicsConsole" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Runtime" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="MonotonicCounter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Variable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="EmuVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="StatusCode" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PcdPeim" >\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
               <DatumType>UINT32</DatumType>\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</Token>\r
               <DatumType>UINT32</DatumType>\r
-              <HiiEnable>false</HiiEnable>\r
-              <VpdEnable>false</VpdEnable>\r
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-              <SkuEnable>false</SkuEnable>\r
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-              <MaxSku>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <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
                 <DatumType>UINT32</DatumType>\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</Token>\r
                 <DatumType>UINT32</DatumType>\r
-                <HiiEnable>false</HiiEnable>\r
-                <VpdEnable>false</VpdEnable>\r
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-                <SkuEnable>false</SkuEnable>\r
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-                <MaxSku>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="WatchDogTimer" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="FtwLite" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugPort" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <!--\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugSupport" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       -->\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Terminal" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHubStdErr" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="NullMemoryTest" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HiiDatabase" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ConSplitter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BC" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Dhcp4" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SNP" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Ebc" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SetupBrowser" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DriverSample" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PciBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="AtapiPassThru" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="IdeBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Uhci" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiDisk" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBot" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi0" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi1" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbKb" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMassStorage" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMouse" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
 \r
       <!-- IPF -->\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Partition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="English" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIo" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeIpl" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="GraphicsConsole" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Runtime" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="MonotonicCounter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Variable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="EmuVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="StatusCode" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PcdPeim" >\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
               <DatumType>UINT32</DatumType>\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</Token>\r
               <DatumType>UINT32</DatumType>\r
-              <HiiEnable>false</HiiEnable>\r
-              <VpdEnable>false</VpdEnable>\r
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-              <SkuEnable>false</SkuEnable>\r
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-              <MaxSku>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <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
                 <DatumType>UINT32</DatumType>\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</Token>\r
                 <DatumType>UINT32</DatumType>\r
-                <HiiEnable>false</HiiEnable>\r
-                <VpdEnable>false</VpdEnable>\r
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-                <SkuEnable>false</SkuEnable>\r
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-                <MaxSku>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="WatchDogTimer" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="FtwLite" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugPort" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <!--\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugSupport" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>   \r
       -->   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Terminal" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHubStdErr" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="NullMemoryTest" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HiiDatabase" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ConSplitter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BC" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Dhcp4" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SNP" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Ebc" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SetupBrowser" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DriverSample" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PciBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="AtapiPassThru" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="IdeBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Uhci" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiDisk" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBot" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi0" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi1" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbKb" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMassStorage" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMouse" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
 \r
       <!-- EBC -->\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Partition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="English" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIo" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMain" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeIpl" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="GraphicsConsole" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <!-- Not Support\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Runtime" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="MonotonicCounter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Variable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="EmuVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="StatusCode" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>     \r
       --> \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PcdPeim" >\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
               <DatumType>UINT32</DatumType>\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</Token>\r
               <DatumType>UINT32</DatumType>\r
-              <HiiEnable>false</HiiEnable>\r
-              <VpdEnable>false</VpdEnable>\r
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-              <SkuEnable>false</SkuEnable>\r
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-              <MaxSku>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <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
                 <DatumType>UINT32</DatumType>\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</Token>\r
                 <DatumType>UINT32</DatumType>\r
-                <HiiEnable>false</HiiEnable>\r
-                <VpdEnable>false</VpdEnable>\r
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-                <SkuEnable>false</SkuEnable>\r
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-                <MaxSku>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiVariable" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="WatchDogTimer" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="FtwLite" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugPort" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <!-- \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugSupport" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>  \r
       -->    \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Terminal" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHub" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHubStdErr" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="NullMemoryTest" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HiiDatabase" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ConSplitter" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BC" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Dhcp4" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SNP" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <!--\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Ebc" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA> \r
       -->     \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SetupBrowser" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DriverSample" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PciBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="AtapiPassThru" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="IdeBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Uhci" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiDisk" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBot" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBus" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi0" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi1" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbKb" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMassStorage" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMouse" >\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </OTHER_COMPONENTS>\r
   </FrameworkModules>\r
       </ModuleSA>      \r
     </OTHER_COMPONENTS>\r
   </FrameworkModules>\r
index 02f7e355048af880e52c3b9bfa4b819f7601dcc7..4ab1114752bc3dc623e94be7e0afa62faf6d0eec 100644 (file)
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\r
   <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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
       </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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
             <DatumType>UINT32</DatumType>\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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIpl" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="GraphicsConsole" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Runtime" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="MonotonicCounter" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Variable" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="EmuVariable" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="StatusCode" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PcdPeim" >\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
               <DatumType>UINT32</DatumType>\r
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
               <Token>0x0001000f</Token>\r
               <DatumType>UINT32</DatumType>\r
-              <HiiEnable>false</HiiEnable>\r
-              <VpdEnable>false</VpdEnable>\r
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-              <SkuEnable>false</SkuEnable>\r
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-              <MaxSku>0</MaxSku>\r
-              <SkuId>0</SkuId>\r
-              <DatumSize>4</DatumSize>\r
-              <VariableGuid>0</VariableGuid>\r
-              <VariableName>L""</VariableName>\r
-              <DataOffset>0</DataOffset>\r
-              <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
                 <DatumType>UINT32</DatumType>\r
              <C_Name>PcdVpdBaseAddress</C_Name>\r
                 <Token>0x00010010</Token>\r
                 <DatumType>UINT32</DatumType>\r
-                <HiiEnable>false</HiiEnable>\r
-                <VpdEnable>false</VpdEnable>\r
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-                <SkuEnable>false</SkuEnable>\r
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-                <MaxSku>0</MaxSku>\r
-                <SkuId>0</SkuId>\r
-                <DatumSize>4</DatumSize>\r
-                <VariableGuid>0</VariableGuid>\r
-                <VariableName>L""</VariableName>\r
-                <DataOffset>0</DataOffset>\r
-                <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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="WatchDogTimer" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="FtwLite" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Terminal" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHub" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHubStdErr" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="NullMemoryTest" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiDatabase" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ConSplitter" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BC" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Dhcp4" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SNP" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Ebc" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SetupBrowser" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DriverSample" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PciBus" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="AtapiPassThru" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="IdeBus" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Uhci" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiBus" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiDisk" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBot" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBus" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi0" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi1" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbKb" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" >\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
             <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
             <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
             <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
             <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>      \r
     </OTHER_COMPONENTS>\r
   </FrameworkModules>\r
       </ModuleSA>      \r
     </OTHER_COMPONENTS>\r
   </FrameworkModules>\r
index b8a9f1b19e8001589621e6325ab5b5888b17facb..e041ef53d502568f89f9e9269998bbd43fa6b6a5 100644 (file)
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain">\r
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain">\r
-        <PcdBuildDeclarations>\r
-            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtCpuModel</C_Name>\r
             <Token>0x00001007</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtCpuModel</C_Name>\r
             <Token>0x00001007</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>48</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>48</MaxDatumSize>\r
+            <Value>L"Intel(R) Processor Model"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
             <Token>0x00001009</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
             <Token>0x00001009</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>44</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>44</MaxDatumSize>\r
+            <Value>L"..\\..\\Fv\\Fv_Recovery.fd"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdWinNtBootMode</C_Name>\r
             <Token>0x00001006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdWinNtBootMode</C_Name>\r
             <Token>0x00001006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtMemorySize</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtMemorySize</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>10</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"64!64"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>10</MaxDatumSize>\r
+            <Value>L"64!64"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>10</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>L"64!64"</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>10</MaxDatumSize>\r
+            <Value>L"64!64"</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </SEC>\r
     <PEI_CORE>\r
       </ModuleSA>\r
     </SEC>\r
     <PEI_CORE>\r
             <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>\r
           </Arch>\r
         </Libraries>\r
             <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>\r
           </Arch>\r
         </Libraries>\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">\r
       </ModuleSA>\r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="DYNAMIC">\r
+            <C_Name>PcdKentTestDynamicUINT32</C_Name>\r
+            <Token>0x0001000e</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+          </PcdData>        \r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
             <Token>0x0001000f</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
             <Token>0x0001000f</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x8</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            \r
+            <Value>0x8</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            \r
+            <Value>0x0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdTestDynamicUint8</C_Name>\r
             <Token>0x00011000</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdTestDynamicUint8</C_Name>\r
             <Token>0x00011000</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x1</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdTestDynamicUint16</C_Name>\r
             <Token>0x00011001</Token>\r
             <DatumType>UINT16</DatumType>\r
             <C_Name>PcdTestDynamicUint16</C_Name>\r
             <Token>0x00011001</Token>\r
             <DatumType>UINT16</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>2</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x1234</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>2</MaxDatumSize>\r
+            <Value>0x1234</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdTestDynamicUint32</C_Name>\r
             <Token>0x00011002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdTestDynamicUint32</C_Name>\r
             <Token>0x00011002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>NoDefault</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdTestDynamicUint64</C_Name>\r
             <Token>0x00011003</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdTestDynamicUint64</C_Name>\r
             <Token>0x00011003</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>8</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>NoDefault</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdTestDynamicBoolean</C_Name>\r
             <Token>0x00011004</Token>\r
             <DatumType>BOOLEAN</DatumType>\r
             <C_Name>PcdTestDynamicBoolean</C_Name>\r
             <Token>0x00011004</Token>\r
             <DatumType>BOOLEAN</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>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
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>NoDefault</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>      \r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>      \r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">\r
         <Libraries>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">\r
         <Libraries>\r
             <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>\r
           </Arch>\r
         </Libraries>\r
             <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>\r
           </Arch>\r
         </Libraries>\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">\r
       </ModuleSA>\r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            \r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
             <Token>0x0001000f</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
             <Token>0x0001000f</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x8</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            \r
+            <Value>0x8</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdVpdBaseAddress</C_Name>\r
             <Token>0x00010010</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            \r
+            <Value>0x0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            \r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">\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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            \r
+            <Value>0</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtMemorySize</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtMemorySize</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>10</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"64!64"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>10</MaxDatumSize>\r
+            <Value>L"64!64"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
             <Token>0x00001000</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
             <Token>0x00001000</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>24</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>24</MaxDatumSize>\r
+            <Value>L"FW;40960;512"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtVirtualDisk</C_Name>\r
             <Token>0x00001001</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtVirtualDisk</C_Name>\r
             <Token>0x00001001</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>24</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>24</MaxDatumSize>\r
+            <Value>L"FW;40960;512"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtSerialPort</C_Name>\r
             <Token>0x00001002</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtSerialPort</C_Name>\r
             <Token>0x00001002</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>20</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>L"COM1!COM2"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>18</MaxDatumSize>\r
+            <Value>L"COM1!COM2"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtUga</C_Name>\r
             <Token>0x00001003</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtUga</C_Name>\r
             <Token>0x00001003</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>50</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>50</MaxDatumSize>\r
+            <Value>L"UGA Window 1!UGA Window 2"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtCpuModel</C_Name>\r
             <Token>0x00001007</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtCpuModel</C_Name>\r
             <Token>0x00001007</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>48</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>48</MaxDatumSize>\r
+            <Value>L"Intel(R) Processor Model"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtFileSystem</C_Name>\r
             <Token>0x00001004</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtFileSystem</C_Name>\r
             <Token>0x00001004</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>120</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>120</MaxDatumSize>\r
+            <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtConsole</C_Name>\r
             <Token>0x0000100a</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtConsole</C_Name>\r
             <Token>0x0000100a</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>50</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>50</MaxDatumSize>\r
+            <Value>L"Bus Driver Console Window"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtCpuSpeed</C_Name>\r
             <Token>0x00001008</Token>\r
             <DatumType>VOID*</DatumType>\r
             <C_Name>PcdWinNtCpuSpeed</C_Name>\r
             <Token>0x00001008</Token>\r
             <DatumType>VOID*</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>8</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>L"3000"</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FEATURE_FLAG">\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>L"3000"</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FEATURE_FLAG">\r
             <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
             <Token>0x0001000d</Token>\r
             <DatumType>BOOLEAN</DatumType>\r
             <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
             <Token>0x0001000d</Token>\r
             <DatumType>BOOLEAN</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>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
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x1</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
             <Token>0x0001000b</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
             <Token>0x0001000b</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x1234</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x1234</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
             <Token>0x0001000c</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
             <Token>0x0001000c</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x5678</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="DYNAMIC">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x5678</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
             <Token>0x0001000e</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
             <Token>0x0001000e</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0x0</DefaultValue>\r
-          </PcdBuildData>\r
-          \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld">\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" 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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x1f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x1f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
     </DXE_DRIVERS>\r
   </FrameworkModules>\r
       </ModuleSA>\r
     </DXE_DRIVERS>\r
   </FrameworkModules>\r
-  <PcdDynamicBuildDeclarations>\r
+  <DynamicPcdBuildDefinitions>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <Token>0x00001005</Token>\r
       <DatumType>VOID*</DatumType>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <Token>0x00001005</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>10</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"64!64"</DefaultValue>\r
+      <MaxDatumSize>10</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"64!64"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>48</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+      <MaxDatumSize>48</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"Intel(R) Processor Model"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>24</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+      <MaxDatumSize>24</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"FW;40960;512"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>24</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+      <MaxDatumSize>24</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"FW;40960;512"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>120</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
+      <MaxDatumSize>120</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <Token>0x00001002</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <Token>0x00001002</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>20</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"COM1!COM2"</DefaultValue>\r
+      <MaxDatumSize>20</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"COM1!COM2"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>50</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
+      <MaxDatumSize>50</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"Bus Driver Console Window"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtUga</C_Name>\r
       <Token>0x00001003</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtUga</C_Name>\r
       <Token>0x00001003</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>50</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
+      <MaxDatumSize>50</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"UGA Window 1!UGA Window 2"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint8</C_Name>\r
       <Token>0x00011000</Token>\r
       <DatumType>UINT8</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint8</C_Name>\r
       <Token>0x00011000</Token>\r
       <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1</DefaultValue>\r
+      <MaxDatumSize>1</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>0x1</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint16</C_Name>\r
       <Token>0x00011001</Token>\r
       <DatumType>UINT16</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint16</C_Name>\r
       <Token>0x00011001</Token>\r
       <DatumType>UINT16</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>2</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1234</DefaultValue>\r
+      <MaxDatumSize>2</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r \r
+        <Value>0x1234</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint32</C_Name>\r
       <Token>0x00011002</Token>\r
       <DatumType>UINT32</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint32</C_Name>\r
       <Token>0x00011002</Token>\r
       <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>NoDefault</DefaultValue>\r
+      <MaxDatumSize>4</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>0</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint64</C_Name>\r
       <Token>0x00011003</Token>\r
       <DatumType>UINT64</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint64</C_Name>\r
       <Token>0x00011003</Token>\r
       <DatumType>UINT64</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>8</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>NoDefault</DefaultValue>\r
+      <MaxDatumSize>8</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>0</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicBoolean</C_Name>\r
       <Token>0x00011004</Token>\r
       <DatumType>BOOLEAN</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicBoolean</C_Name>\r
       <Token>0x00011004</Token>\r
       <DatumType>BOOLEAN</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>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
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>NoDefault</DefaultValue>\r
+      <MaxDatumSize>1</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>0</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
       <DatumType>VOID*</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
       <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>8</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"3000"</DefaultValue>\r
+      <MaxDatumSize>8</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>L"3000"</Value>\r
+      </SkuInfo>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
       <Token>0x0001000e</Token>\r
       <DatumType>UINT32</DatumType>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
       <Token>0x0001000e</Token>\r
       <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0</DefaultValue>\r
+      <MaxDatumSize>4</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <Value>0x0</Value>\r
+      </SkuInfo>\r
+    </PcdBuildData>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdKentTestDynamicUINT32</C_Name>\r
+      <Token>0x0001000e</Token>\r
+      <DatumType>UINT32</DatumType>\r
+      <MaxDatumSize>4</MaxDatumSize>\r
+      <SkuInfo>\r
+        <SkuId>0</SkuId>\r
+        <VariableName>0x0062 0x006F 0x006F 0x0074 0x006D 0x006F 0x0064 0x0065</VariableName>\r
+        <VariableGuid>0</VariableGuid>\r
+        <VariableOffset>0x123</VariableOffset>\r
+        <HiiDefaultValue>0x123</HiiDefaultValue>\r
+        </SkuInfo>\r
     </PcdBuildData>\r
     </PcdBuildData>\r
-  </PcdDynamicBuildDeclarations>\r
+  </DynamicPcdBuildDefinitions>\r
   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
     <Option>CC_FLAGS="/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\""</Option>\r
   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
     <Option>CC_FLAGS="/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\""</Option>\r
index 636fd0e429a2ef4140ecbc11799374e19fd6a8cf..62aee07ae56ab33375b5f6e4d1f7b110a1d520b8 100644 (file)
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>                \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>                \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
       </ModuleSA>\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>                \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>                \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
       </ModuleSA>       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
       </ModuleSA>\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>         \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>         \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
       </ModuleSA>\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
index d3068a5817b1224d3ca7405cda1546e61ddfcde4..be98926e7d4ac14f3f0d8e67896d4d40f2a318a7 100644 (file)
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
   <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </SEC>\r
     <PEI_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </PEIM>\r
     <DXE_CORE>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </DXE_CORE>\r
     <DXE_DRIVERS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>10000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>10000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r
             <DatumType>UINT64</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>0xE0000000</DefaultValue>\r
-          </PcdBuildData>        \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>8</MaxDatumSize>\r
+            <Value>0xE0000000</Value>\r
+          </PcdData>        \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdPostCodePropertyMask</C_Name>\r
             <Token>0x0000000b</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x00</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
-        <PcdBuildDeclarations>\r
-        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>   \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>   \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x0f</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r
             <DatumType>UINT32</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>0x80000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r
             <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0xAF</DefaultValue>\r
-          </PcdBuildData>           \r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0xAF</Value>\r
+          </PcdData>           \r
+        </PcdBuildDefinition>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >\r
       </ModuleSA>        \r
index 4001558ef697092f2c897a3a32b84cc74923c07b..4057c417e44783e1e10771b860ae36766d101673 100644 (file)
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 package org.tianocore.build.pcd.action;\r
 \r
 **/\r
 package org.tianocore.build.pcd.action;\r
 \r
-import java.io.BufferedReader;\r
+import java.io.BufferedReader;                                                    \r
 import java.io.File;\r
 import java.io.FileReader;\r
 import java.io.IOException;\r
 import java.io.File;\r
 import java.io.FileReader;\r
 import java.io.IOException;\r
@@ -31,20 +31,21 @@ import java.util.UUID;
 \r
 import org.apache.xmlbeans.XmlException;\r
 import org.apache.xmlbeans.XmlObject;\r
 \r
 import org.apache.xmlbeans.XmlException;\r
 import org.apache.xmlbeans.XmlObject;\r
+import org.tianocore.DynamicPcdBuildDefinitionsDocument;\r
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions;\r
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo;\r
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData;\r
 import org.tianocore.FrameworkModulesDocument;\r
 import org.tianocore.FrameworkPlatformDescriptionDocument;\r
 import org.tianocore.FrameworkPlatformDescriptionDocument.FrameworkPlatformDescription;\r
 import org.tianocore.ModuleSADocument;\r
 import org.tianocore.ModuleSADocument.ModuleSA;\r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.FrameworkModulesDocument;\r
 import org.tianocore.FrameworkPlatformDescriptionDocument;\r
 import org.tianocore.FrameworkPlatformDescriptionDocument.FrameworkPlatformDescription;\r
 import org.tianocore.ModuleSADocument;\r
 import org.tianocore.ModuleSADocument.ModuleSA;\r
 import org.tianocore.PackageSurfaceAreaDocument;\r
-import org.tianocore.PcdBuildDeclarationsDocument.PcdBuildDeclarations.PcdBuildData;\r
-import org.tianocore.PcdBuildDeclarationsDocument.PcdBuildDeclarations.PcdBuildData.SkuData;\r
-import org.tianocore.PcdDefinitionsDocument.PcdDefinitions;\r
-import org.tianocore.PcdDynamicBuildDeclarationsDocument.PcdDynamicBuildDeclarations;\r
-import org.tianocore.build.autogen.CommonDefinition;\r
+import org.tianocore.PcdBuildDefinitionDocument.PcdBuildDefinition;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.global.SurfaceAreaQuery;\r
 import org.tianocore.build.pcd.action.ActionMessage;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.global.SurfaceAreaQuery;\r
 import org.tianocore.build.pcd.action.ActionMessage;\r
+import org.tianocore.build.pcd.entity.DynamicTokenValue;\r
 import org.tianocore.build.pcd.entity.MemoryDatabaseManager;\r
 import org.tianocore.build.pcd.entity.SkuInstance;\r
 import org.tianocore.build.pcd.entity.Token;\r
 import org.tianocore.build.pcd.entity.MemoryDatabaseManager;\r
 import org.tianocore.build.pcd.entity.SkuInstance;\r
 import org.tianocore.build.pcd.entity.Token;\r
@@ -421,8 +422,8 @@ class SkuIdTable {
 \r
         int index;\r
 \r
 \r
         int index;\r
 \r
-        Integer [] skuIds = new Integer[token.maxSkuCount + 1];\r
-        skuIds[0] = new Integer(token.maxSkuCount);\r
+        Integer [] skuIds = new Integer[token.skuData.size() + 1];\r
+        skuIds[0] = new Integer(token.skuData.size());\r
         for (index = 1; index < skuIds.length; index++) {\r
             skuIds[index] = new Integer(token.skuData.get(index - 1).id);\r
         }\r
         for (index = 1; index < skuIds.length; index++) {\r
             skuIds[index] = new Integer(token.skuData.get(index - 1).id);\r
         }\r
@@ -516,15 +517,15 @@ class LocalTokenNumberTable {
             str += " | PCD_TYPE_STRING";\r
         }\r
 \r
             str += " | PCD_TYPE_STRING";\r
         }\r
 \r
-        if (token.skuEnabled) {\r
+        if (token.isSkuEnable()) {\r
             str += " | PCD_TYPE_SKU_ENABLED";\r
         }\r
 \r
             str += " | PCD_TYPE_SKU_ENABLED";\r
         }\r
 \r
-        if (token.hiiEnabled) {\r
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {\r
             str += " | PCD_TYPE_HII";\r
         }\r
 \r
             str += " | PCD_TYPE_HII";\r
         }\r
 \r
-        if (token.vpdEnabled) {\r
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {\r
             str += " | PCD_TYPE_VPD";\r
         }\r
         \r
             str += " | PCD_TYPE_VPD";\r
         }\r
         \r
@@ -723,11 +724,11 @@ class PcdDatabase {
     }\r
 \r
     private int getAlignmentSize (Token token) {\r
     }\r
 \r
     private int getAlignmentSize (Token token) {\r
-        if (token.hiiEnabled) {\r
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {\r
             return 2;\r
         }\r
 \r
             return 2;\r
         }\r
 \r
-        if (token.vpdEnabled) {\r
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {\r
             return 4;\r
         }\r
 \r
             return 4;\r
         }\r
 \r
@@ -760,7 +761,8 @@ class PcdDatabase {
         return hString;\r
     }\r
 \r
         return hString;\r
     }\r
 \r
-     public void genCode () {\r
+     public void genCode () \r
+        throws EntityException {\r
 \r
         final String newLine                        = "\r\n";\r
         final String declNewLine                    = ";\r\n";\r
 \r
         final String newLine                        = "\r\n";\r
         final String declNewLine                    = ";\r\n";\r
@@ -924,7 +926,8 @@ class PcdDatabase {
         return str;\r
     }\r
 \r
         return str;\r
     }\r
 \r
-    private HashMap<String, ArrayList<String>> processTokens (List<Token> alToken) {\r
+    private HashMap<String, ArrayList<String>> processTokens (List<Token> alToken) \r
+        throws EntityException {\r
 \r
         HashMap <String, ArrayList<String>> map = new HashMap<String, ArrayList<String>>();\r
 \r
 \r
         HashMap <String, ArrayList<String>> map = new HashMap<String, ArrayList<String>>();\r
 \r
@@ -936,7 +939,7 @@ class PcdDatabase {
         for (int index = 0; index < alToken.size(); index++) {\r
             Token token = alToken.get(index);\r
 \r
         for (int index = 0; index < alToken.size(); index++) {\r
             Token token = alToken.get(index);\r
 \r
-            if (token.skuEnabled) {\r
+            if (token.isSkuEnable()) {\r
                 //\r
                 // BugBug: Schema only support Data type now\r
                 //\r
                 //\r
                 // BugBug: Schema only support Data type now\r
                 //\r
@@ -955,10 +958,10 @@ class PcdDatabase {
                 }\r
 \r
             } else {\r
                 }\r
 \r
             } else {\r
-                if (token.hiiEnabled) {\r
+                if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {\r
                     decl.add(getVariableEnableTypeDeclaration(token));\r
                     inst.add(getVariableEnableInstantiation(token));\r
                     decl.add(getVariableEnableTypeDeclaration(token));\r
                     inst.add(getVariableEnableInstantiation(token));\r
-                } else if (token.vpdEnabled) {\r
+                } else if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {\r
                     decl.add(getVpdEnableTypeDeclaration(token));\r
                     inst.add(getVpdEnableTypeInstantiation(token));\r
                 } else if (token.isStringType()) {\r
                     decl.add(getVpdEnableTypeDeclaration(token));\r
                     inst.add(getVpdEnableTypeInstantiation(token));\r
                 } else if (token.isStringType()) {\r
@@ -1011,10 +1014,10 @@ class PcdDatabase {
         } else if (token.datumType == Token.DATUM_TYPE.BOOLEAN) {\r
             typeStr = "BOOLEAN %s_%s[%d];\r\n";\r
         } else if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
         } else if (token.datumType == Token.DATUM_TYPE.BOOLEAN) {\r
             typeStr = "BOOLEAN %s_%s[%d];\r\n";\r
         } else if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
-            return String.format("UINT8 %s_s[%d];\r\n", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.maxSkuCount);\r
+            return String.format("UINT8 %s_%s[%d];\r\n", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.skuData.size());\r
         } \r
 \r
         } \r
 \r
-        return String.format(typeStr, token.getPrimaryKeyString(), "SkuDataTable", token.maxSkuCount);\r
+        return String.format(typeStr, token.getPrimaryKeyString(), "SkuDataTable", token.skuData.size());\r
 \r
     }\r
 \r
 \r
     }\r
 \r
@@ -1022,12 +1025,12 @@ class PcdDatabase {
         String str = "";\r
 \r
         if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
         String str = "";\r
 \r
         if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
-            return String.format("UINT8 %s_s[%d]", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.maxSkuCount);\r
+            return String.format("UINT8 %s_%s[%d]", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.skuData.size());\r
         } else {\r
             str = "{ ";\r
         } else {\r
             str = "{ ";\r
-            for (int idx = 0; idx < token.maxSkuCount; idx++) {\r
+            for (int idx = 0; idx < token.skuData.size(); idx++) {\r
                 str += token.skuData.get(idx).toString();\r
                 str += token.skuData.get(idx).toString();\r
-                if (idx != token.maxSkuCount - 1) {\r
+                if (idx != token.skuData.size() - 1) {\r
                     str += ", ";\r
                 }\r
             }\r
                     str += ", ";\r
                 }\r
             }\r
@@ -1041,9 +1044,9 @@ class PcdDatabase {
     private String getDataTypeInstantiation (Token token) {\r
 \r
         if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
     private String getDataTypeInstantiation (Token token) {\r
 \r
         if (token.datumType == Token.DATUM_TYPE.POINTER) {\r
-            return String.format("%s /* %s */", token.datum.toString(), token.getPrimaryKeyString());\r
+            return String.format("%s /* %s */", token.getDefaultSku().value, token.getPrimaryKeyString());\r
         } else {\r
         } else {\r
-            return String.format("%s /* %s */", token.datum.toString(), token.getPrimaryKeyString());\r
+            return String.format("%s /* %s */", token.getDefaultSku().value, token.getPrimaryKeyString());\r
         }\r
     }\r
 \r
         }\r
     }\r
 \r
@@ -1075,7 +1078,7 @@ class PcdDatabase {
     }\r
 \r
     private String getVpdEnableTypeInstantiation (Token token) {\r
     }\r
 \r
     private String getVpdEnableTypeInstantiation (Token token) {\r
-        return String.format("{ %d } /* %s */", token.vpdOffset,\r
+        return String.format("{ %s } /* %s */", token.getDefaultSku().vpdOffset,\r
                                                 token.getPrimaryKeyString());\r
     }\r
 \r
                                                 token.getPrimaryKeyString());\r
     }\r
 \r
@@ -1093,10 +1096,14 @@ class PcdDatabase {
       return String.format("VARIABLE_HEAD  %s", token.getPrimaryKeyString());\r
     }\r
 \r
       return String.format("VARIABLE_HEAD  %s", token.getPrimaryKeyString());\r
     }\r
 \r
-    private String getVariableEnableInstantiation (Token token) {\r
-        return String.format("{ %d, %d, %d } /* %s */", guidTable.add(token.variableGuid, token.getPrimaryKeyString()),\r
-                                                        stringTable.add(token.variableName, token),\r
-                                                        token.variableOffset, \r
+    private String getVariableEnableInstantiation (Token token) \r
+        throws EntityException {\r
+        //\r
+        // Need scott fix\r
+        // \r
+        return String.format("{ %d, %d, %s } /* %s */", guidTable.add(token.getDefaultSku().variableGuid, token.getPrimaryKeyString()),\r
+                                                        stringTable.add(token.getDefaultSku().getStringOfVariableName(), token),\r
+                                                        token.getDefaultSku().variableOffset, \r
                                                         token.getPrimaryKeyString());\r
     }\r
 \r
                                                         token.getPrimaryKeyString());\r
     }\r
 \r
@@ -1287,7 +1294,6 @@ public class CollectPCDAction {
         // memory database.\r
         //\r
         createTokenInDBFromFPD();\r
         // memory database.\r
         //\r
         createTokenInDBFromFPD();\r
-\r
         \r
         //\r
         // Call Private function genPcdDatabaseSourceCode (void); ComponentTypeBsDriver\r
         \r
         //\r
         // Call Private function genPcdDatabaseSourceCode (void); ComponentTypeBsDriver\r
@@ -1436,25 +1442,29 @@ public class CollectPCDAction {
         int                                 index             = 0;\r
         int                                 index2            = 0;\r
         int                                 pcdIndex          = 0;\r
         int                                 index             = 0;\r
         int                                 index2            = 0;\r
         int                                 pcdIndex          = 0;\r
-        List<PcdBuildData>                  pcdBuildDataArray = new ArrayList<PcdBuildData>();\r
-        PcdBuildData                        pcdBuildData      = null;\r
+        List<PcdBuildDefinition.PcdData>    pcdBuildDataArray = new ArrayList<PcdBuildDefinition.PcdData>();\r
+        PcdBuildDefinition.PcdData          pcdBuildData      = null;\r
         Token                               token             = null;\r
         Token                               token             = null;\r
-        UUID                                nullUUID          = new UUID(0,0);\r
-        UUID                                platformTokenSpace= nullUUID;\r
         SkuInstance                         skuInstance       = null;\r
         int                                 skuIndex          = 0;\r
         List<ModuleInfo>                    modules           = null;\r
         String                              primaryKey        = null;\r
         SkuInstance                         skuInstance       = null;\r
         int                                 skuIndex          = 0;\r
         List<ModuleInfo>                    modules           = null;\r
         String                              primaryKey        = null;\r
-        PcdBuildData.SkuData[]              skuDataArray      = null;\r
         String                              exceptionString   = null;\r
         UsageInstance                       usageInstance     = null;\r
         String                              primaryKey1       = null;\r
         String                              primaryKey2       = null;\r
         boolean                             isDuplicate       = false;\r
         String                              exceptionString   = null;\r
         UsageInstance                       usageInstance     = null;\r
         String                              primaryKey1       = null;\r
         String                              primaryKey2       = null;\r
         boolean                             isDuplicate       = false;\r
-        java.util.List<java.lang.String>    tokenGuidStringArray = null;\r
+        Token.PCD_TYPE                      pcdType           = Token.PCD_TYPE.UNKNOWN;\r
+        Token.DATUM_TYPE                    datumType         = Token.DATUM_TYPE.UNKNOWN;\r
+        int                                 tokenNumber       = 0;\r
+        String                              moduleName        = null;\r
+        String                              datum             = null;\r
+        int                                 maxDatumSize      = 0;\r
 \r
         //\r
 \r
         //\r
-        // Get all <ModuleSA> from FPD file.\r
+        // ----------------------------------------------\r
+        // 1), Get all <ModuleSA> from FPD file.\r
+        // ----------------------------------------------\r
         // \r
         modules = getComponentsFromFPD();\r
 \r
         // \r
         modules = getComponentsFromFPD();\r
 \r
@@ -1463,7 +1473,9 @@ public class CollectPCDAction {
         }\r
 \r
         //\r
         }\r
 \r
         //\r
-        // Loop all modules to process <PcdBuildDeclarations> for each module.\r
+        // -------------------------------------------------------------------\r
+        // 2), Loop all modules to process <PcdBuildDeclarations> for each module.\r
+        // -------------------------------------------------------------------\r
         // \r
         for (index = 0; index < modules.size(); index ++) {\r
             isDuplicate =  false;\r
         // \r
         for (index = 0; index < modules.size(); index ++) {\r
             isDuplicate =  false;\r
@@ -1494,52 +1506,122 @@ public class CollectPCDAction {
                 continue;\r
             }\r
 \r
                 continue;\r
             }\r
 \r
-            if (modules.get(index).module.getPcdBuildDeclarations() == null) {\r
-                continue;\r
-            }\r
-            pcdBuildDataArray = modules.get(index).module.getPcdBuildDeclarations().getPcdBuildDataList();\r
-            if (pcdBuildDataArray == null) {\r
+           //\r
+           // It is legal for a module does not contains ANY pcd build definitions.\r
+           // \r
+           if (modules.get(index).module.getPcdBuildDefinition() == null) {\r
                 continue;\r
                 continue;\r
-            }\r
-            if (pcdBuildDataArray.size() == 0) {\r
-                continue;\r
-            }\r
+           }\r
+    \r
+            pcdBuildDataArray = modules.get(index).module.getPcdBuildDefinition().getPcdDataList();\r
+\r
+            moduleName = modules.get(index).module.getModuleName();\r
 \r
             //\r
 \r
             //\r
-            // Loop all Pcd entry for a module and add it into memory database.\r
+            // ----------------------------------------------------------------------\r
+            // 2.1), Loop all Pcd entry for a module and add it into memory database.\r
+            // ----------------------------------------------------------------------\r
             // \r
             for (pcdIndex = 0; pcdIndex < pcdBuildDataArray.size(); pcdIndex ++) {\r
                 pcdBuildData = pcdBuildDataArray.get(pcdIndex);\r
                 primaryKey   = Token.getPrimaryKeyString(pcdBuildData.getCName(),\r
                                                          translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));\r
             // \r
             for (pcdIndex = 0; pcdIndex < pcdBuildDataArray.size(); pcdIndex ++) {\r
                 pcdBuildData = pcdBuildDataArray.get(pcdIndex);\r
                 primaryKey   = Token.getPrimaryKeyString(pcdBuildData.getCName(),\r
                                                          translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));\r
+                pcdType      = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());\r
+                datumType    = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());\r
+                tokenNumber  = Integer.decode(pcdBuildData.getToken().toString());\r
+                datum        = pcdBuildData.getValue();\r
+                maxDatumSize = pcdBuildData.getMaxDatumSize();\r
 \r
 \r
+                //\r
+                // -------------------------------------------------------------------------------------------\r
+                // 2.1.1), Do some necessary checking work for FixedAtBuild, FeatureFlag and PatchableInModule\r
+                // -------------------------------------------------------------------------------------------\r
+                // \r
+                if (!Token.isDynamic(pcdType)) {\r
+                     //\r
+                     // Value is required.\r
+                     // \r
+                     if (datum == null) {\r
+                         exceptionString = String.format("There is no value for PCD entry %s in module %s!",\r
+                                                         pcdBuildData.getCName(),\r
+                                                         moduleName);\r
+                         throw new EntityException(exceptionString);\r
+                     }\r
+\r
+                     //\r
+                     // Check whether the datum size is matched datum type.\r
+                     // \r
+                     if ((exceptionString = verifyDatumSize(pcdBuildData.getCName(), \r
+                                                            moduleName,\r
+                                                            maxDatumSize, \r
+                                                            datumType)) != null) {\r
+                         throw new EntityException(exceptionString);\r
+                     }\r
+                }\r
 \r
 \r
+                //\r
+                // ---------------------------------------------------------------------------------\r
+                // 2.1.2), Create token or update token information for current anaylized PCD data.\r
+                // ---------------------------------------------------------------------------------\r
+                // \r
                 if (dbManager.isTokenInDatabase(primaryKey)) {\r
                     //\r
                     // If the token is already exist in database, do some necessary checking\r
                     // and add a usage instance into this token in database\r
                     // \r
                     token = dbManager.getTokenByKey(primaryKey);\r
                 if (dbManager.isTokenInDatabase(primaryKey)) {\r
                     //\r
                     // If the token is already exist in database, do some necessary checking\r
                     // and add a usage instance into this token in database\r
                     // \r
                     token = dbManager.getTokenByKey(primaryKey);\r
+    \r
+                    //\r
+                    // checking for DatumType, DatumType should be unique for one PCD used in different\r
+                    // modules.\r
+                    // \r
+                    if (token.datumType != datumType) {\r
+                        exceptionString = String.format("The datum type of PCD entry %s is %s, which is different with  %s defined in before!",\r
+                                                        pcdBuildData.getCName(), \r
+                                                        pcdBuildData.getDatumType().toString(), \r
+                                                        Token.getStringOfdatumType(token.datumType));\r
+                        throw new EntityException(exceptionString);\r
+                    }\r
 \r
                     //\r
 \r
                     //\r
-                    // Checking for DatumSize\r
+                    // Check token number is valid\r
                     // \r
                     // \r
-                    if (token.datumSize != pcdBuildData.getDatumSize()) {\r
-                        exceptionString = String.format("The datum size of PCD entry %s is %d, which is different with %d defined in before!",\r
-                                                        pcdBuildData.getCName(),  pcdBuildData.getDatumSize(), token.datumSize);\r
+                    if (tokenNumber != token.tokenNumber) {\r
+                        exceptionString = String.format("The token number of PCD entry %s in module %s is different with same PCD entry in other modules!",\r
+                                                        pcdBuildData.getCName(),\r
+                                                        moduleName);\r
                         throw new EntityException(exceptionString);\r
                     }\r
 \r
                     //\r
                         throw new EntityException(exceptionString);\r
                     }\r
 \r
                     //\r
-                    // checking for DatumType\r
+                    // For same PCD used in different modules, the PCD type should all be dynamic or non-dynamic.\r
                     // \r
                     // \r
-                    if (token.datumType != Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString())) {\r
-                        exceptionString = String.format("The datum type of PCD entry %s is %s, which is different with  %s defined in before!",\r
-                                                        pcdBuildData.getCName(), \r
-                                                        pcdBuildData.getDatumType().toString(), \r
-                                                        Token.getStringOfdatumType(token.datumType));\r
+                    if (token.isDynamicPCD != Token.isDynamic(pcdType)) {\r
+                        exceptionString = String.format("For PCD entry %s in module %s, you define dynamic or non-dynamic PCD type which"+\r
+                                                        "is different with others module's",\r
+                                                        token.cName,\r
+                                                        moduleName);\r
                         throw new EntityException(exceptionString);\r
                     }\r
                         throw new EntityException(exceptionString);\r
                     }\r
+\r
+                    if (token.isDynamicPCD) {\r
+                        //\r
+                        // Check datum is equal the datum in dynamic information.\r
+                        // For dynamic PCD, you can do not write <Value> in sperated every <PcdBuildDefinition> in different <ModuleSA>,\r
+                        // But if you write, the <Value> must be same as the value in <DynamicPcdBuildDefinitions>.\r
+                        // \r
+                        if (!token.isSkuEnable() && \r
+                            (token.skuData.get(0).value.type == DynamicTokenValue.VALUE_TYPE.DEFAULT_TYPE)) {\r
+                            if (!datum.equalsIgnoreCase(token.skuData.get(0).value.value)) {\r
+                                exceptionString = String.format("For dynamic PCD %s in module %s, the datum in <ModuleSA> is "+\r
+                                                                "not equal to the datum in <DynamicPcdBuildDefinitions>, it is "+\r
+                                                                "illega! You can choose no <Value> in <ModuleSA>!",\r
+                                                                token.cName,\r
+                                                                moduleName);\r
+                            }\r
+                        }\r
+                    }\r
+                    \r
                 } else {\r
                     //\r
                     // If the token is not in database, create a new token instance and add\r
                 } else {\r
                     //\r
                     // If the token is not in database, create a new token instance and add\r
@@ -1547,71 +1629,73 @@ public class CollectPCDAction {
                     // \r
                     token = new Token(pcdBuildData.getCName(), \r
                                       translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));\r
                     // \r
                     token = new Token(pcdBuildData.getCName(), \r
                                       translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));\r
-\r
-                    token.datum         = pcdBuildData.getDefaultValue();\r
-                    token.pcdType       = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());\r
-                    token.datumType     = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());\r
-                    token.datumSize     = pcdBuildData.getDatumSize();\r
-                    token.skuId         = Integer.decode(pcdBuildData.getSkuId());\r
-\r
-                    if (pcdBuildData.getToken() == null) {\r
-                        exceptionString = String.format("In FPD file, No <TokenNumber> defined for PCD entry %s in module %s",\r
-                                                        token.cName,\r
-                                                        modules.get(index).module.getModuleName());\r
-                        throw new EntityException(exceptionString);\r
-                    }\r
-                    token.tokenNumber = Integer.decode(pcdBuildData.getToken().getStringValue());\r
-\r
-                    if ((token.pcdType == Token.PCD_TYPE.DYNAMIC) ||\r
-                        (token.pcdType == Token.PCD_TYPE.DYNAMIC_EX)) {\r
-                        updateDynamicInformation(modules.get(index).module.getModuleName(),  token);\r
+    \r
+                    token.datumType     = datumType;\r
+                    token.tokenNumber   = tokenNumber;\r
+                    token.isDynamicPCD  = Token.isDynamic(pcdType);\r
+                    token.datumSize     = maxDatumSize;\r
+                    \r
+                    if (token.isDynamicPCD) {\r
+                        //\r
+                        // For Dynamic and Dynamic Ex type, need find the dynamic information\r
+                        // in <DynamicPcdBuildDefinition> section in FPD file.\r
+                        // \r
+                        updateDynamicInformation(moduleName, \r
+                                                 token,\r
+                                                 datum,\r
+                                                 maxDatumSize);\r
                     }\r
                     }\r
-\r
+    \r
                     dbManager.addTokenToDatabase(primaryKey, token);\r
                 }\r
 \r
                 //\r
                     dbManager.addTokenToDatabase(primaryKey, token);\r
                 }\r
 \r
                 //\r
-                // Create an usage instance for this token\r
+                // -----------------------------------------------------------------------------------\r
+                // 2.1.3), Add the PcdType in current module into this Pcd token's supported PCD type.\r
+                // -----------------------------------------------------------------------------------\r
+                // \r
+                token.updateSupportPcdType(pcdType);\r
+\r
+                //\r
+                // ------------------------------------------------\r
+                // 2.1.4), Create an usage instance for this token.\r
+                // ------------------------------------------------\r
                 // \r
                 usageInstance = new UsageInstance(token, \r
                 // \r
                 usageInstance = new UsageInstance(token, \r
-                                                  Token.getpcdTypeFromString(pcdBuildData.getItemType().toString()),\r
-                                                  modules.get(index).module.getModuleName(), \r
+                                                  moduleName, \r
                                                   translateSchemaStringToUUID(modules.get(index).module.getModuleGuid()),\r
                                                   modules.get(index).module.getPackageName(),\r
                                                   translateSchemaStringToUUID(modules.get(index).module.getPackageGuid()),\r
                                                   modules.get(index).type, \r
                                                   translateSchemaStringToUUID(modules.get(index).module.getModuleGuid()),\r
                                                   modules.get(index).module.getPackageName(),\r
                                                   translateSchemaStringToUUID(modules.get(index).module.getPackageGuid()),\r
                                                   modules.get(index).type, \r
-                                                  Token.getpcdTypeFromString(pcdBuildData.getItemType().toString()),\r
+                                                  pcdType,\r
                                                   modules.get(index).module.getArch().toString(), \r
                                                   null,\r
                                                   modules.get(index).module.getArch().toString(), \r
                                                   null,\r
-                                                  pcdBuildData.getDefaultValue());\r
+                                                  datum,\r
+                                                  maxDatumSize);\r
                 token.addUsageInstance(usageInstance);\r
             }\r
         }\r
     }\r
 \r
     /**\r
                 token.addUsageInstance(usageInstance);\r
             }\r
         }\r
     }\r
 \r
     /**\r
-       Update dynamic information for PCD entry.\r
+       Get dynamic information for a dynamic PCD from <DynamicPcdBuildDefinition> seciton in FPD file.\r
        \r
        \r
-       Dynamic information is retrieved from <PcdDynamicBuildDeclarations> in\r
-       FPD file.\r
+       This function should be implemented in GlobalData in future.\r
        \r
        \r
-       @param moduleName\r
-       @param token\r
+       @param token         The token instance which has hold module's PCD information\r
+       @param moduleName    The name of module who will use this Dynamic PCD.\r
        \r
        \r
-       @return Token\r
-    **/\r
-    private Token updateDynamicInformation(String moduleName, Token token) \r
+       @return DynamicPcdBuildDefinitions.PcdBuildData\r
+     */\r
+    /***/\r
+    private DynamicPcdBuildDefinitions.PcdBuildData getDynamicInfoFromFPD(Token     token,\r
+                                                                          String    moduleName)\r
         throws EntityException {\r
         throws EntityException {\r
-        PcdDynamicBuildDeclarations                pcdDynamicBuildDescriptions = null;\r
-        \r
-        boolean                                    isFound                     = false;            \r
-        int                                        index                       = 0;\r
-        String                                     primaryKey                  = null;\r
-        SkuInstance                                skuInstance                 = null;\r
-        int                                        skuIndex                    = 0;\r
-        String                                     exceptionString             = null;\r
-        PcdDynamicBuildDeclarations.PcdBuildData.SkuData[] skuDataArray             = null;\r
-        List<PcdDynamicBuildDeclarations.PcdBuildData>     pcdDynamicBuildDataArray = null;\r
+        int    index             = 0;\r
+        String exceptionString   = null;\r
+        String dynamicPrimaryKey = null;\r
+        DynamicPcdBuildDefinitions                    dynamicPcdBuildDefinitions = null;\r
+        List<DynamicPcdBuildDefinitions.PcdBuildData> dynamicPcdBuildDataArray   = null;\r
 \r
         //\r
         // If FPD document is not be opened, open and initialize it.\r
 \r
         //\r
         // If FPD document is not be opened, open and initialize it.\r
@@ -1626,109 +1710,238 @@ public class CollectPCDAction {
             }\r
         }\r
 \r
             }\r
         }\r
 \r
-        pcdDynamicBuildDescriptions = fpdDocInstance.getFrameworkPlatformDescription().getPcdDynamicBuildDeclarations();\r
-        if (pcdDynamicBuildDescriptions == null) {\r
-            throw new EntityException(String.format("There are no <PcdDynamicBuildDescriptions> in FPD file but contains Dynamic type "+\r
-                                                    "PCD entry %s in module %s!",\r
-                                                    token.cName,\r
-                                                    moduleName));\r
+        dynamicPcdBuildDefinitions = fpdDocInstance.getFrameworkPlatformDescription().getDynamicPcdBuildDefinitions();\r
+        if (dynamicPcdBuildDefinitions == null) {\r
+            exceptionString = String.format("There are no <PcdDynamicBuildDescriptions> in FPD file but contains Dynamic type "+\r
+                                            "PCD entry %s in module %s!",\r
+                                            token.cName,\r
+                                            moduleName);\r
+            throw new EntityException(exceptionString);\r
         }\r
 \r
         }\r
 \r
-        pcdDynamicBuildDataArray    = pcdDynamicBuildDescriptions.getPcdBuildDataList();\r
-        if (pcdDynamicBuildDataArray == null) {\r
-            throw new EntityException(String.format("There are no PcdDynamicBuildData in <PcdDynamicBuildDeclaration> section but contains Dynamic type"+\r
-                                                    "PCD entry %s in module %s.!",\r
-                                                    token.cName,\r
-                                                    moduleName));\r
+        dynamicPcdBuildDataArray = dynamicPcdBuildDefinitions.getPcdBuildDataList();\r
+        for (index = 0; index < dynamicPcdBuildDataArray.size(); index ++) {\r
+            dynamicPrimaryKey = Token.getPrimaryKeyString(dynamicPcdBuildDataArray.get(index).getCName(),\r
+                                                          translateSchemaStringToUUID(dynamicPcdBuildDataArray.get(index).getTokenSpaceGuid()));\r
+            if (dynamicPrimaryKey.equalsIgnoreCase(token.getPrimaryKeyString())) {\r
+                return dynamicPcdBuildDataArray.get(index);\r
+            }\r
         }\r
 \r
         }\r
 \r
-        isFound = false;\r
-        for (index = 0; index < pcdDynamicBuildDataArray.size(); index ++) {\r
-            if (pcdDynamicBuildDataArray.get(index).getTokenSpaceGuidList().size() != 0) {\r
-                primaryKey = Token.getPrimaryKeyString(pcdDynamicBuildDataArray.get(index).getCName(), \r
-                                                       translateSchemaStringToUUID(pcdDynamicBuildDataArray.get(index).getTokenSpaceGuidList().get(0)));\r
-            } else {\r
-                primaryKey = Token.getPrimaryKeyString(pcdDynamicBuildDataArray.get(index).getCName(), \r
-                                                       translateSchemaStringToUUID(null));\r
+        return null;\r
+    }\r
+\r
+    /**\r
+       Verify the maxDatumSize for a PCD data is matched to Datum type.\r
+       \r
+       @param token             The token instance\r
+       @param moduleName        The module name who use this PCD data.\r
+       @param maxDatumSize      The value of max datum size in FPD file\r
+       @param datumType         The datum type\r
+       \r
+       @return String           if is unmatched, set the exception information\r
+                                as return value, otherwice is null.\r
+    **/\r
+    private String verifyDatumSize(String           cName, \r
+                                   String           moduleName,\r
+                                   int              maxDatumSize, \r
+                                   Token.DATUM_TYPE datumType) {\r
+        String exceptionString = null;\r
+        switch (datumType) {\r
+        case UINT8:\r
+            if (maxDatumSize != 1) {\r
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+\r
+                                                "is UINT8, but datum size is %d, they are not matched!",\r
+                                                cName,\r
+                                                moduleName,\r
+                                                maxDatumSize);\r
+            }\r
+            break;\r
+        case UINT16:\r
+            if (maxDatumSize != 2) {\r
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+\r
+                                                "is UINT16, but datum size is %d, they are not matched!",\r
+                                                cName,\r
+                                                moduleName,\r
+                                                maxDatumSize);\r
+            }\r
+            break;\r
+        case UINT32:\r
+            if (maxDatumSize != 4) {\r
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+\r
+                                                "is UINT32, but datum size is %d, they are not matched!",\r
+                                                cName,\r
+                                                moduleName,\r
+                                                maxDatumSize);\r
             }\r
             }\r
+            break;\r
+        case UINT64:\r
+            if (maxDatumSize != 8) {\r
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+\r
+                                                "is UINT64, but datum size is %d, they are not matched!",\r
+                                                cName,\r
+                                                moduleName,\r
+                                                maxDatumSize);\r
+            }\r
+            break;\r
+        case BOOLEAN:\r
+            if (maxDatumSize != 1) {\r
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+\r
+                                                "is BOOLEAN, but datum size is %d, they are not matched!",\r
+                                                cName,\r
+                                                moduleName,\r
+                                                maxDatumSize);\r
+            }\r
+            break;\r
+        }\r
 \r
 \r
-            if (primaryKey.equalsIgnoreCase(token.getPrimaryKeyString())) {\r
-                isFound = true;\r
+        return exceptionString;\r
+    }\r
 \r
 \r
-                //\r
-                // For Hii related value\r
-                // \r
-                token.hiiEnabled    = pcdDynamicBuildDataArray.get(index).getHiiEnable();\r
-                if (token.hiiEnabled) {\r
-                    token.variableGuid      = Token.getGUIDFromSchemaObject(pcdDynamicBuildDataArray.get(index).getVariableGuid());\r
-                    if (token.variableGuid == null) {\r
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +\r
-                                                                "but no <VariableGuid> is found! Please fix the FPD file!",\r
-                                                                token.cName));\r
+    /**\r
+       Update dynamic information for PCD entry.\r
+       \r
+       Dynamic information is retrieved from <PcdDynamicBuildDeclarations> in\r
+       FPD file.\r
+       \r
+       @param moduleName        The name of the module who use this PCD\r
+       @param token             The token instance\r
+       @param datum             The <datum> in module's PCD information\r
+       @param maxDatumSize      The <maxDatumSize> in module's PCD information\r
+       \r
+       @return Token\r
+     */\r
+    private Token updateDynamicInformation(String   moduleName, \r
+                                           Token    token,\r
+                                           String   datum,\r
+                                           int      maxDatumSize) \r
+        throws EntityException {\r
+        int                 index           = 0;\r
+        int                 offset;\r
+        String              exceptionString = null;\r
+        DynamicTokenValue   dynamicValue;\r
+        SkuInstance         skuInstance     = null;\r
+        String              temp;\r
+        boolean             hasSkuId0       = false;\r
+\r
+        List<DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo>   skuInfoList = null;\r
+        DynamicPcdBuildDefinitions.PcdBuildData                 dynamicInfo = null;\r
+\r
+        dynamicInfo = getDynamicInfoFromFPD(token, moduleName);\r
+        if (dynamicInfo == null) {\r
+            exceptionString = String.format("For Dynamic PCD %s used by module %s, "+\r
+                                            "there is no dynamic information in <DynamicPcdBuildDefinitions> "+\r
+                                            "in FPD file, but it is required!",\r
+                                            token.cName,\r
+                                            moduleName);\r
+            throw new EntityException(exceptionString);\r
+        }\r
 \r
 \r
-                    }\r
-                    token.variableName      = pcdDynamicBuildDataArray.get(index).getVariableName();\r
-                    if (token.variableName == null) {\r
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +\r
-                                                                "but no <VariableName> is found! Please fix the FPD file!",\r
-                                                                token.cName));\r
-                    }\r
+        skuInfoList = dynamicInfo.getSkuInfoList();\r
 \r
 \r
-                    if (pcdDynamicBuildDataArray.get(index).getDataOffset() == null) {\r
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +\r
-                                                                "but no <DataOffset> is found! Please fix the FPD file!",\r
-                                                                token.cName));\r
-                    }\r
-                    token.variableOffset    = Integer.decode(pcdDynamicBuildDataArray.get(index).getDataOffset());\r
-                }\r
+        //\r
+        // Loop all sku data \r
+        // \r
+        for (index = 0; index < skuInfoList.size(); index ++) {\r
+            skuInstance = new SkuInstance();\r
+            //\r
+            // Although SkuId in schema is BigInteger, but in fact, sku id is 32 bit value.\r
+            // \r
+            temp = skuInfoList.get(index).getSkuId().toString();\r
+            skuInstance.id = Integer.decode(temp);\r
 \r
 \r
-                //\r
-                // For Vpd related value\r
-                // \r
-                token.vpdEnabled    = pcdDynamicBuildDataArray.get(index).getVpdEnable();\r
-                if (token.vpdEnabled) {\r
-                    if (pcdDynamicBuildDataArray.get(index).getDataOffset() == null) {\r
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, VpdEnable is true" +\r
-                                                                "but no <DataOffset> is found! Please fix the FPD file!",\r
-                                                                token.cName));\r
-                    }\r
-                    token.vpdOffset         = Integer.decode(pcdDynamicBuildDataArray.get(index).getDataOffset());\r
-                }\r
+            if (skuInstance.id == 0) {\r
+                hasSkuId0 = true;\r
+            }\r
+            //\r
+            // Judge whether is DefaultGroup at first, because most case is DefautlGroup.\r
+            // \r
+            if (skuInfoList.get(index).getValue() != null) {\r
+                skuInstance.value.setValue(skuInfoList.get(index).getValue());\r
+                token.skuData.add(skuInstance);\r
 \r
                 //\r
 \r
                 //\r
-                // For SkuData\r
+                // Judege wether is same of datum between module's information\r
+                // and dynamic information.\r
                 // \r
                 // \r
-                token.skuEnabled    = pcdDynamicBuildDataArray.get(index).getSkuEnable();\r
-                if (token.skuEnabled) {\r
-                    skuDataArray      = (PcdDynamicBuildDeclarations.PcdBuildData.SkuData[])pcdDynamicBuildDataArray.get(index).getSkuDataList().toArray();\r
-                    token.maxSkuCount = Integer.decode(pcdDynamicBuildDataArray.get(index).getMaxSku());\r
-                    if (skuDataArray == null) {\r
-                        exceptionString = String.format("In FPD file, the <SkuEnable> is true for PCD entry %s in module %s, But no any sku data.",\r
-                                                        token.cName, moduleName);\r
-                        throw new EntityException(exceptionString);\r
-                    }\r
-                    if (token.maxSkuCount != pcdDynamicBuildDataArray.get(index).sizeOfSkuDataArray()) {\r
-                        exceptionString = String.format("In FPD file, <MaxSku> is not equal to the size of <SkuDataArray> for PCD entry %s in module %s",\r
-                                                        token.cName, moduleName);\r
+                if (datum != null) {\r
+                    if ((skuInstance.id == 0)                                   &&\r
+                        !datum.equalsIgnoreCase(skuInfoList.get(index).getValue())) {\r
+                        exceptionString = String.format("For dynamic PCD %s, module %s give <datum> as %s which is different with "+\r
+                                                        "Sku 0's <datum> %s defined in <DynamicPcdBuildDefinitions>! Please sync them at first!",\r
+                                                        token.cName,\r
+                                                        datum,\r
+                                                        skuInfoList.get(index).getValue());\r
                         throw new EntityException(exceptionString);\r
                     }\r
                         throw new EntityException(exceptionString);\r
                     }\r
+                }\r
+                continue;\r
+            }\r
 \r
 \r
-                    for (skuIndex = 0; skuIndex < pcdDynamicBuildDataArray.get(index).sizeOfSkuDataArray(); skuIndex ++) {\r
-                        skuInstance = new SkuInstance(skuDataArray[skuIndex].getId(),\r
-                                                      skuDataArray[skuIndex].getValue());\r
-                        token.skuData.add(skuInstance);\r
-                    }\r
+            //\r
+            // Judge whether is HII group case.\r
+            // \r
+            if (skuInfoList.get(index).getVariableName() != null) {\r
+                exceptionString = null;\r
+                if (skuInfoList.get(index).getVariableGuid() == null) {\r
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+                                                    "file, who use HII, but there is no <VariableGuid> defined for Sku %d data!",\r
+                                                    token.cName,\r
+                                                    index);\r
+                                                    \r
+                }\r
+\r
+                if (skuInfoList.get(index).getVariableOffset() == null) {\r
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+                                                    "file, who use HII, but there is no <VariableOffset> defined for Sku %d data!",\r
+                                                    token.cName,\r
+                                                    index);\r
+                }\r
+\r
+                if (skuInfoList.get(index).getHiiDefaultValue() == null) {\r
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+\r
+                                                    "file, who use HII, but there is no <HiiDefaultValue> defined for Sku %d data!",\r
+                                                    token.cName,\r
+                                                    index);\r
                 }\r
                 }\r
-                break;\r
+\r
+                if (exceptionString != null) {\r
+                    throw new EntityException(exceptionString);\r
+                }\r
+                offset = Integer.decode(skuInfoList.get(index).getVariableOffset());\r
+                if (offset > 0xFFFF) {\r
+                    throw new EntityException(String.format("For dynamic PCD %s ,  the variable offset defined in sku %d data "+\r
+                                                            "exceed 64K, it is not allowed!",\r
+                                                            token.cName,\r
+                                                            index));\r
+                }\r
+\r
+                skuInstance.value.setHiiData(skuInfoList.get(index).getVariableName(),\r
+                                             translateSchemaStringToUUID(skuInfoList.get(index).getVariableGuid().toString()),\r
+                                             skuInfoList.get(index).getVariableOffset(),\r
+                                             skuInfoList.get(index).getHiiDefaultValue());\r
+                token.skuData.add(skuInstance);\r
+                continue;\r
             }\r
             }\r
-        }\r
-        if (!isFound) {\r
-            exceptionString = String.format("In FPD file, No dynamic PCD data for PCD entry %s in module %s",\r
-                                            token.cName,\r
-                                            moduleName);\r
+\r
+            if (skuInfoList.get(index).getVpdOffset() != null) {\r
+                skuInstance.value.setVpdData(skuInfoList.get(index).getVpdOffset());\r
+                token.skuData.add(skuInstance);\r
+                continue;\r
+            }\r
+\r
+            exceptionString = String.format("For dynamic PCD %s, the dynamic info must "+\r
+                                            "be one of 'DefaultGroup', 'HIIGroup', 'VpdGroup'.",\r
+                                            token.cName);\r
             throw new EntityException(exceptionString);\r
         }\r
 \r
             throw new EntityException(exceptionString);\r
         }\r
 \r
+        if (!hasSkuId0) {\r
+            exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions>, there are "+\r
+                                            "no sku id = 0 data, which is required for every dynamic PCD",\r
+                                            token.cName);\r
+        }\r
+\r
         return token;\r
     }\r
 \r
         return token;\r
     }\r
 \r
@@ -1764,6 +1977,11 @@ public class CollectPCDAction {
             return null;\r
         }\r
 \r
             return null;\r
         }\r
 \r
+        if (uuidString.equals("0") ||\r
+            uuidString.equalsIgnoreCase("0x0")) {\r
+            return new UUID(0, 0);\r
+        }\r
+\r
         //\r
         // If the UUID schema string is GuidArrayType type then need translate \r
         // to GuidNamingConvention type at first.\r
         //\r
         // If the UUID schema string is GuidArrayType type then need translate \r
         // to GuidNamingConvention type at first.\r
@@ -1848,11 +2066,11 @@ public class CollectPCDAction {
     **/\r
     public static void main(String argv[]) throws EntityException {\r
         CollectPCDAction ca = new CollectPCDAction();\r
     **/\r
     public static void main(String argv[]) throws EntityException {\r
         CollectPCDAction ca = new CollectPCDAction();\r
-        ca.setWorkspacePath("M:/ForPcd/edk2");\r
-        ca.setFPDFilePath("M:/ForPcd/edk2/EdkNt32Pkg/Nt32.fpd");\r
+        ca.setWorkspacePath("m:/tianocore/edk2");\r
+        ca.setFPDFilePath("m:/tianocore/edk2/EdkNt32Pkg/Nt32.fpd");\r
         ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL);\r
         GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",\r
         ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL);\r
         GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",\r
-                            "M:/ForPcd/edk2");\r
+                            "m:/tianocore/edk2");\r
         ca.execute();\r
     }\r
 }\r
         ca.execute();\r
     }\r
 }\r
index 04e585be3bd1da34ec466da8cc613919195ac158..278e58ceaee0b76a734abe00b9237b7e03d126c5 100644 (file)
@@ -292,111 +292,6 @@ public class PCDAutoGenAction extends BuildAction {
                             );\r
     }\r
 \r
                             );\r
     }\r
 \r
-    /**\r
-      Generate unreference token definition string for PCD emulated string. \r
-      \r
-      Maybe some PCD token definition in FPD but not used by any module or library, we \r
-      should also generate token definition in autoge.h/autogen.c, because maybe some\r
-      driver loaded in shell will use this PCD. \r
-\r
-     @param token   The token who want be generated autogen string.\r
-    \r
-    **/\r
-    private void generateUnReferencePcdAutogenString(Token token) {\r
-        hAutoGenString += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", \r
-                                        token.cName, token.tokenNumber);\r
-        switch (token.pcdType) {\r
-        case FEATURE_FLAG:\r
-            hAutoGenString += String.format(\r
-                                "#define _PCD_VALUE_%s   %s\r\n", \r
-                                token.cName, \r
-                                token.datum.toString()\r
-                                );\r
-            hAutoGenString += String.format(\r
-                                "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", \r
-                                token.cName\r
-                                );\r
-            cAutoGenString += String.format(\r
-                                "GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",\r
-                                token.cName,\r
-                                token.cName\r
-                                );\r
-            hAutoGenString += String.format(\r
-                                "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",\r
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),\r
-                                token.cName,\r
-                                token.cName\r
-                                );\r
-            break;\r
-        case FIXED_AT_BUILD:\r
-            hAutoGenString += String.format(\r
-                                "#define _PCD_VALUE_%s   %s\r\n", \r
-                                token.cName, \r
-                                token.datum.toString()\r
-                                );\r
-            hAutoGenString += String.format(\r
-                                "extern const %s _gPcd_FixedAtBuild_%s;\r\n",\r
-                                Token.getAutogendatumTypeString(token.datumType),\r
-                                token.cName\r
-                                );\r
-            cAutoGenString += String.format(\r
-                                "GLOBAL_REMOVE_IF_UNREFERENCED const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",\r
-                                Token.getAutogendatumTypeString(token.datumType),\r
-                                token.cName,\r
-                                token.cName\r
-                                );\r
-            hAutoGenString += String.format(\r
-                                "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",\r
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),\r
-                                token.cName,\r
-                                token.cName\r
-                                );\r
-            break;\r
-        case PATCHABLE_IN_MODULE:\r
-            hAutoGenString += String.format(\r
-                                 "#define _PCD_VALUE_%s   %s\r\n", \r
-                                 token.cName, \r
-                                 token.datum.toString()\r
-                                 );\r
-            hAutoGenString += String.format(\r
-                                 "extern %s _gPcd_BinaryPatch_%s;\r\n",\r
-                                 Token.getAutogendatumTypeString(token.datumType),\r
-                                 token.cName\r
-                                 );\r
-            cAutoGenString += String.format(\r
-                                 "GLOBAL_REMOVE_IF_UNREFERENCED %s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;\r\n",\r
-                                 Token.getAutogendatumTypeString(token.datumType),\r
-                                 token.cName,\r
-                                 token.cName\r
-                                 );\r
-            hAutoGenString += String.format(\r
-                                 "#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",\r
-                                 Token.GetAutogenDefinedatumTypeString(token.datumType),\r
-                                 token.cName,\r
-                                 token.cName\r
-                                 );\r
-            break;\r
-        case DYNAMIC:\r
-            hAutoGenString += String.format(\r
-                                "#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",\r
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),\r
-                                token.cName,\r
-                                Token.getAutogenLibrarydatumTypeString(token.datumType),\r
-                                token.cName\r
-                                );\r
-            break;\r
-        case DYNAMIC_EX:\r
-            break;\r
-        default:\r
-            ActionMessage.warning(this, \r
-                                  "The PCD_TYPE setted by platform is unknown"\r
-                                  );\r
-        }\r
-\r
-        hAutoGenString += "\r\n";\r
-        cAutoGenString += "\r\n";\r
-    }\r
-        \r
     /**\r
       Test case function\r
 \r
     /**\r
       Test case function\r
 \r
index 8af812347fc448e7ca08e45dc2ea9f888e3125c9..77e50203974e093d8ca81056eb6ce83f78002271 100644 (file)
@@ -124,7 +124,7 @@ public class ShowPCDDatabaseAction extends UIAction {
         ShowPCDDatabaseAction showAction = new ShowPCDDatabaseAction();\r
         //showAction.setWorkspacePath(argv[0]);\r
         //showAction.setFPDFilePath(argv[1]);\r
         ShowPCDDatabaseAction showAction = new ShowPCDDatabaseAction();\r
         //showAction.setWorkspacePath(argv[0]);\r
         //showAction.setFPDFilePath(argv[1]);\r
-        showAction.setWorkspacePath("M:/tianocore/edk2/trunk/edk2");\r
+        showAction.setWorkspacePath("e:/tianocore/edk2");\r
         showAction.setFPDFilePath("EdkNt32Pkg/Nt32.fpd");\r
         showAction.execute();\r
     }\r
         showAction.setFPDFilePath("EdkNt32Pkg/Nt32.fpd");\r
         showAction.execute();\r
     }\r
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java
new file mode 100644 (file)
index 0000000..54c8957
--- /dev/null
@@ -0,0 +1,185 @@
+/** @file\r
+  DynamicTokenValue class.\r
+\r
+  This module contains the value type of a dynamic token.\r
\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/  \r
+package org.tianocore.build.pcd.entity;\r
+\r
+import java.util.ArrayList;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.UUID;\r
+\r
+import org.tianocore.build.pcd.exception.EntityException;\r
+\r
+/** This class is to descript a value type of dynamic PCD.\r
+    For a dynamic or dynamicEx type PCD data, the value type can be:\r
+        1) Hii type: the value of dynamic or dynamicEx is stored into a variable.\r
+        2) Vpd type: the value of dynamic or dynamicEx is stored into somewhere set\r
+                     by OEM.\r
+        3) Default type: the value of dynamic or dynamicEx is stored into PCD dynamic\r
+                         database.\r
+**/\r
+public class DynamicTokenValue {\r
+    ///\r
+    /// Enumeration macro defintion for value type.\r
+    /// BUGBUG: Not use upcase charater is to facility for reading. It may be changed\r
+    ///         in coding review.\r
+    public enum        VALUE_TYPE {HII_TYPE, VPD_TYPE, DEFAULT_TYPE}\r
+\r
+    public VALUE_TYPE  type;\r
+\r
+    ///\r
+    /// ---------------------------------------------------------------------\r
+    /// Following member is for HII case.\r
+    /// ---------------------------------------------------------------------\r
+    ///\r
+\r
+    ///\r
+    /// variableName is valid only when this token support Hii functionality. variableName\r
+    /// indicates the value of token is associated with what variable.\r
+    /// variableName is defined in FPD.\r
+    public List        variableName;\r
+\r
+    ///\r
+    /// variableGuid is the GUID this token associated with.\r
+    ///\r
+    public UUID        variableGuid;\r
+\r
+    ///\r
+    /// Variable offset indicate the associated variable's offset in NV storage.\r
+    ///\r
+    public String      variableOffset;\r
+\r
+    ///\r
+    /// The default value for HII case.\r
+    /// \r
+    public String      hiiDefaultValue;\r
+\r
+    ///\r
+    /// Following member is for VPD case.\r
+    /// BUGBUG: Consider 64 bit integer by using java.math.BigInteger.\r
+    /// \r
+    public String      vpdOffset;\r
+\r
+    ///\r
+    /// Following member is for default case.\r
+    /// \r
+    public String      value;\r
+\r
+    public DynamicTokenValue() {\r
+        this.type               = VALUE_TYPE.DEFAULT_TYPE;\r
+        this.variableName       = null;\r
+        this.variableGuid       = null;\r
+        this.variableOffset     = null;\r
+        this.hiiDefaultValue    = null;\r
+\r
+        this.vpdOffset          = null;\r
+\r
+        this.value              = null;\r
+    }\r
+\r
+    /**\r
+       Set the HII case data.\r
+       \r
+       @param variableName\r
+       @param variableGuid\r
+       @param variableOffset\r
+       @param hiiDefaultValue\r
+     */\r
+    public void setHiiData(List        variableName,\r
+                           UUID        variableGuid,\r
+                           String      variableOffset,\r
+                           String      hiiDefaultValue) {\r
+        this.type = VALUE_TYPE.HII_TYPE;\r
+\r
+        this.variableName    = variableName;\r
+        this.variableGuid    = variableGuid;\r
+        this.variableOffset  = variableOffset;\r
+        this.hiiDefaultValue = hiiDefaultValue;\r
+    }\r
+\r
+    /**\r
+       Get the string like L"xxx" for a variable Name.\r
+       \r
+       BUGBUG: In fact, it is not correctly, variable name should be\r
+               treated as unicode UINT16 array.\r
+       \r
+       @return String\r
+     */\r
+    public String getStringOfVariableName() \r
+        throws EntityException {\r
+        String str;\r
+        int    index, num;\r
+        char   ch;\r
+\r
+        str = "";\r
+        for (index = 0; index < variableName.size(); index ++) {\r
+            num = Integer.decode(variableName.get(index).toString());\r
+            if ((num > 127 ) || (num < 0)) {\r
+                throw new EntityException(String.format("variable name contains >0x80 character, now is not support!"));\r
+            }\r
+            str += (char)num;\r
+        }\r
+\r
+        return str;\r
+    }\r
+\r
+    /**\r
+       Get UINT16 array which use string to express a number.\r
+       \r
+       @return String\r
+     */\r
+    public String getStringArrayOfVariableName() {\r
+        String  strArray;\r
+        int     index;\r
+\r
+        strArray =  "{";\r
+        for (index = 0; index < variableName.size(); index ++) {\r
+            strArray += variableName.get(index).toString();\r
+            if (index != (variableName.size() - 1)) {\r
+                strArray += ",";\r
+            }\r
+        }\r
+        strArray += "}";\r
+        return strArray;\r
+    }\r
+\r
+    /**\r
+       Set Vpd case data.\r
+       \r
+       @param vpdOffset\r
+     */\r
+    public void setVpdData(String vpdOffset) {\r
+        this.type = VALUE_TYPE.VPD_TYPE;\r
+\r
+        this.vpdOffset = vpdOffset;\r
+    }\r
+\r
+    /**\r
+       Set default case data.\r
+       \r
+       @param value\r
+     */\r
+    public void setValue(String value) {\r
+        this.type = VALUE_TYPE.DEFAULT_TYPE;\r
+\r
+        this.value = value;\r
+    }\r
+}\r
+\r
+\r
+\r
+\r
+\r
index b03cddeed4cd98e80cfe8b86e75007080f10a989..0ff5b8e33801f9ec89ba82a3dd8f510284abc069 100644 (file)
@@ -145,8 +145,7 @@ public class MemoryDatabaseManager {
         ArrayList<Token>   al   =   new ArrayList<Token>();\r
 \r
         for (index = 0; index < tokenArray.length; index++) {\r
         ArrayList<Token>   al   =   new ArrayList<Token>();\r
 \r
         for (index = 0; index < tokenArray.length; index++) {\r
-            if (tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC ||\r
-                tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC_EX) {\r
+            if (tokenArray[index].isDynamicPCD) {\r
                 al.add(tokenArray[index]);\r
             }\r
         }\r
                 al.add(tokenArray[index]);\r
             }\r
         }\r
index 2886506411c3b4bc35d15b125867137be5b8f81f..6df155157cc88e9f75a8df473622f7e0af0066c1 100644 (file)
@@ -21,11 +21,11 @@ public class SkuInstance {
     ///\r
     /// The id number of this SKU instance\r
     ///\r
     ///\r
     /// The id number of this SKU instance\r
     ///\r
-    public int    id;\r
+    public int              id;\r
     ///\r
     /// The value of this SKU instance\r
     ///\r
     ///\r
     /// The value of this SKU instance\r
     ///\r
-    public Object value;\r
+    public DynamicTokenValue value;\r
 \r
     /**\r
       Constructure function\r
 \r
     /**\r
       Constructure function\r
@@ -33,8 +33,13 @@ public class SkuInstance {
       @param id     sku id \r
       @param value  sku value for this id.\r
     **/\r
       @param id     sku id \r
       @param value  sku value for this id.\r
     **/\r
-    public SkuInstance(int id, Object value) {\r
+    public SkuInstance(int id, DynamicTokenValue value) {\r
         this.id    = id;\r
         this.value = value;\r
     }\r
         this.id    = id;\r
         this.value = value;\r
     }\r
+\r
+    public SkuInstance() {\r
+        this.id    = 0;\r
+        this.value = new DynamicTokenValue();\r
+    }\r
 }\r
 }\r
index 3136864872a7559034622b6f7d437297b2fe6725..62e2be5cc969a80911e94d83b78a8cb9a7a11138 100644 (file)
@@ -70,9 +70,16 @@ public class Token {
     public int              tokenNumber;\r
 \r
     ///\r
     public int              tokenNumber;\r
 \r
     ///\r
-    /// pcdType is the PCD item type defined by platform developer.\r
+    /// All supported PCD type, this value can be retrieved from SPD\r
+    /// Currently, only record all PCD type for this token in FPD file.\r
+    /// \r
+    public List<PCD_TYPE>   supportedPcdType;\r
+\r
     ///\r
     ///\r
-    public PCD_TYPE         pcdType;\r
+    /// If the token's item type is Dynamic or DynamicEx type, isDynamicPCD\r
+    /// is true.\r
+    /// \r
+    public boolean          isDynamicPCD;\r
 \r
     ///\r
     /// datumSize is to descript the fix size or max size for this token. \r
 \r
     ///\r
     /// datumSize is to descript the fix size or max size for this token. \r
@@ -82,77 +89,17 @@ public class Token {
 \r
     ///\r
     /// datum type is to descript what type can be expressed by a PCD token.\r
 \r
     ///\r
     /// datum type is to descript what type can be expressed by a PCD token.\r
-    /// datumType is defined in SPD.\r
+    /// For same PCD used in different module, the datum type should be unique.\r
+    /// So it belong memeber to Token class.\r
     ///\r
     public DATUM_TYPE       datumType;\r
 \r
     ///\r
     public DATUM_TYPE       datumType;\r
 \r
-    ///\r
-    /// hiiEnabled is to indicate whether the token support Hii functionality.\r
-    /// hiiEnabled is defined in FPD.\r
-    ///\r
-    public boolean          hiiEnabled;\r
-\r
-    ///\r
-    /// variableName is valid only when this token support Hii functionality. variableName\r
-    /// indicates the value of token is associated with what variable.\r
-    /// variableName is defined in FPD.\r
-    ///\r
-    public String           variableName;\r
-\r
-    ///\r
-    /// variableGuid is the GUID this token associated with.\r
-    /// variableGuid is defined in FPD.\r
-    ///\r
-    public UUID             variableGuid;\r
-\r
-    ///\r
-    /// Variable offset indicate the associated variable's offset in NV storage.\r
-    /// variableOffset is defined in FPD.\r
-    ///\r
-    public int              variableOffset;\r
-\r
-    ///\r
-    /// skuEnabled is to indicate whether the token support Sku functionality.\r
-    /// skuEnabled is defined in FPD.\r
-    ///\r
-    public boolean          skuEnabled;\r
-\r
     ///\r
     /// skuData contains all value for SkuNumber of token.\r
     ///\r
     /// skuData contains all value for SkuNumber of token.\r
-    /// skuData is defined in FPD.\r
+    /// This field is for Dynamic or DynamicEx type PCD, \r
     ///\r
     public List<SkuInstance> skuData;\r
 \r
     ///\r
     public List<SkuInstance> skuData;\r
 \r
-    ///\r
-    /// maxSkuCount indicate the max count of sku data.\r
-    /// maxSkuCount is defined in FPD.\r
-    ///\r
-    public int              maxSkuCount;\r
-\r
-    ///\r
-    /// SkuId is the id of current selected SKU.\r
-    /// SkuId is defined in FPD.\r
-    ///\r
-    public int              skuId;\r
-\r
-    ///\r
-    /// datum is the value set by platform developer.\r
-    /// datum is defined in FPD.\r
-    ///\r
-    public Object           datum;\r
-\r
-    ///\r
-    /// BUGBUG: fix comment\r
-    /// vpdEnabled is defined in FPD.\r
-    ///\r
-    public boolean          vpdEnabled;\r
-\r
-    ///\r
-    /// BUGBUG: fix comment\r
-    /// vpdOffset is defined in FPD.\r
-    ///\r
-    public long             vpdOffset;\r
-\r
     ///\r
     /// consumers array record all module private information who consume this PCD token.\r
     ///\r
     ///\r
     /// consumers array record all module private information who consume this PCD token.\r
     ///\r
@@ -164,22 +111,51 @@ public class Token {
         this.cName                  = cName;\r
         this.tokenSpaceName         = (tokenSpaceName == null) ? nullUUID : tokenSpaceName;\r
         this.tokenNumber            = 0;\r
         this.cName                  = cName;\r
         this.tokenSpaceName         = (tokenSpaceName == null) ? nullUUID : tokenSpaceName;\r
         this.tokenNumber            = 0;\r
-        this.pcdType                = PCD_TYPE.UNKNOWN;\r
         this.datumType              = DATUM_TYPE.UNKNOWN;\r
         this.datumSize              = -1;\r
         this.datumType              = DATUM_TYPE.UNKNOWN;\r
         this.datumSize              = -1;\r
-        this.datum                  = null;\r
-        this.hiiEnabled             = false;\r
-        this.variableGuid           = null;\r
-        this.variableName           = "";\r
-        this.variableOffset         = -1;\r
-        this.skuEnabled             = false;\r
-        this.skuId                  = -1;\r
-        this.maxSkuCount            = -1;\r
         this.skuData                = new ArrayList<SkuInstance>();\r
         this.skuData                = new ArrayList<SkuInstance>();\r
-        this.vpdEnabled             = false;\r
-        this.vpdOffset              = -1;\r
 \r
         this.consumers              = new HashMap<String, UsageInstance>();\r
 \r
         this.consumers              = new HashMap<String, UsageInstance>();\r
+        this.supportedPcdType       = new ArrayList<PCD_TYPE>();\r
+    }\r
+\r
+    /**\r
+      updateSupportPcdType\r
+      \r
+      SupportPcdType should be gotten from SPD file actually, but now it just\r
+      record all PCD type for this token in FPD file.\r
+      \r
+      @param pcdType    new PCD type found in FPD file for this token.\r
+    **/\r
+    public void updateSupportPcdType(PCD_TYPE pcdType) {\r
+        int     index = 0;\r
+        boolean found = false;\r
+        for (index = 0; index < this.supportedPcdType.size(); index ++) {\r
+            if (this.supportedPcdType.get(index) == pcdType) {\r
+                found = true;\r
+                break;\r
+            }\r
+        }\r
+        if (!found) {\r
+            this.supportedPcdType.add(pcdType);\r
+        }\r
+    }\r
+\r
+    /**\r
+       Judge whether pcdType is belong to dynamic type. Dynamic type includes\r
+       DYNAMIC and DYNAMIC_EX.\r
+       \r
+       @param pcdType\r
+       \r
+       @return boolean\r
+     */\r
+    public static boolean isDynamic(PCD_TYPE pcdType) {\r
+        if ((pcdType == PCD_TYPE.DYNAMIC   ) ||\r
+            (pcdType == PCD_TYPE.DYNAMIC_EX)) {\r
+            return true;\r
+        }\r
+\r
+        return false;\r
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r
@@ -201,6 +177,18 @@ public class Token {
         }\r
     }\r
 \r
         }\r
     }\r
 \r
+    /**\r
+       If skudata list contains more than one data, then Sku mechanism is enable.\r
+       \r
+       @return boolean\r
+     */\r
+    public boolean isSkuEnable() {\r
+        if (this.skuData.size() > 1) {\r
+            return true;\r
+        }\r
+        return false;\r
+    }\r
+\r
     /**\r
        Get the token primary key in token database.\r
        \r
     /**\r
        Get the token primary key in token database.\r
        \r
@@ -540,29 +528,69 @@ public class Token {
         return uuid;\r
     }\r
 \r
         return uuid;\r
     }\r
 \r
+    public DynamicTokenValue getDefaultSku() {\r
+        DynamicTokenValue dynamicData;\r
+        int               index;\r
+        for (index = 0; index < this.skuData.size(); index ++) {\r
+            if (skuData.get(index).id == 0) {\r
+                return skuData.get(index).value;\r
+            }\r
+        }\r
+\r
+        return null;\r
+    }\r
     //\r
     // BugBug: We need change this algorithm accordingly when schema is updated\r
     //          to support no default value.\r
     //\r
     public boolean hasDefaultValue () {\r
     //\r
     // BugBug: We need change this algorithm accordingly when schema is updated\r
     //          to support no default value.\r
     //\r
     public boolean hasDefaultValue () {\r
-\r
-        if (hiiEnabled) {\r
-            return true;\r
+        int               value         = 0;\r
+        boolean           isInteger     = true;\r
+        DynamicTokenValue dynamicValue  = null;\r
+\r
+        if (this.isDynamicPCD) {\r
+            dynamicValue = getDefaultSku();\r
+            switch (dynamicValue.type) {\r
+            case HII_TYPE:\r
+                try {\r
+                    value = Integer.decode(dynamicValue.hiiDefaultValue);\r
+                } catch (NumberFormatException nfEx) {\r
+                    isInteger = false;\r
+                }\r
+                \r
+                if (isInteger && (value == 0)) {\r
+                    return false;\r
+                } else {\r
+                    return true;\r
+                }\r
+\r
+            case VPD_TYPE:\r
+                return false;\r
+\r
+            case DEFAULT_TYPE:\r
+                try{\r
+                    value = Integer.decode(dynamicValue.value);\r
+                } catch (NumberFormatException nfEx) {\r
+                    isInteger = false;\r
+                }\r
+\r
+                if (isInteger && (value == 0)) {\r
+                    return false;\r
+                } else {\r
+                    return true;\r
+                }\r
+\r
+            }\r
         }\r
 \r
         }\r
 \r
-        if (vpdEnabled) {\r
-            return true;\r
-        }\r
-\r
-        if (datum.toString().compareTo("NoDefault") == 0) {\r
-            return false;\r
-        }\r
-\r
-        return true;\r
+        return false;\r
     }\r
 \r
     }\r
 \r
+    //\r
+    // TODO: Need scott's confirmation\r
+    // \r
     public boolean isStringType () {\r
     public boolean isStringType () {\r
-        String str = datum.toString();\r
+        String str = getDefaultSku().value;\r
 \r
         if (datumType == Token.DATUM_TYPE.POINTER &&\r
             str.startsWith("L\"") && \r
 \r
         if (datumType == Token.DATUM_TYPE.POINTER &&\r
             str.startsWith("L\"") && \r
@@ -574,7 +602,7 @@ public class Token {
     }\r
 \r
     public String getStringTypeString () {                       \r
     }\r
 \r
     public String getStringTypeString () {                       \r
-        return datum.toString().substring(2, datum.toString().length() - 1);\r
+        return getDefaultSku().value.substring(2, getDefaultSku().value.length() - 1);\r
     }\r
 }\r
 \r
     }\r
 }\r
 \r
index 90c0f6322fb50896345f84d566b54df40e0156ce..378f26f4b0af0fd79305c3f9b5477ca28ca586b5 100644 (file)
@@ -34,60 +34,78 @@ public class UsageInstance {
   /// The module type of usage instance.\r
   /// \r
   public enum MODULE_TYPE {SEC, PEI_CORE, PEIM, DXE_CORE, DXE_DRIVERS, OTHER_COMPONENTS}\r
   /// The module type of usage instance.\r
   /// \r
   public enum MODULE_TYPE {SEC, PEI_CORE, PEIM, DXE_CORE, DXE_DRIVERS, OTHER_COMPONENTS}\r
+\r
   ///\r
   /// This parent that this usage instance belongs to.\r
   ///\r
   public Token            parentToken;\r
   ///\r
   /// This parent that this usage instance belongs to.\r
   ///\r
   public Token            parentToken;\r
+\r
   ///\r
   /// The name of the module who contains this PCD.\r
   ///\r
   public String           moduleName;\r
   ///\r
   /// The name of the module who contains this PCD.\r
   ///\r
   public String           moduleName;\r
+\r
   ///\r
   /// The GUID of the module who contains this PCD. \r
   /// \r
   public UUID             moduleGUID;\r
   ///\r
   /// The GUID of the module who contains this PCD. \r
   /// \r
   public UUID             moduleGUID;\r
+\r
   ///\r
   /// The name of the package whose module contains this PCD.\r
   ///\r
   public String           packageName;\r
   ///\r
   /// The name of the package whose module contains this PCD.\r
   ///\r
   public String           packageName;\r
+\r
   ///\r
   /// The GUID of the package whose module contains this PCD.\r
   /// \r
   public UUID             packageGUID;\r
   ///\r
   /// The GUID of the package whose module contains this PCD.\r
   /// \r
   public UUID             packageGUID;\r
+\r
   ///\r
   /// The PCD type defined for module \r
   /// \r
   public Token.PCD_TYPE   modulePcdType;\r
   ///\r
   /// The PCD type defined for module \r
   /// \r
   public Token.PCD_TYPE   modulePcdType;\r
+\r
   ///\r
   /// The arch string of module contains this PCD\r
   ///\r
   public String           arch;\r
   ///\r
   /// The arch string of module contains this PCD\r
   ///\r
   public String           arch;\r
+\r
   ///\r
   /// The version of module contains this PCD\r
   /// \r
   public String           version;\r
   ///\r
   /// The version of module contains this PCD\r
   /// \r
   public String           version;\r
+\r
   ///\r
   /// The module type for this usage instance.\r
   ///\r
   public MODULE_TYPE      moduleType;\r
   ///\r
   /// The module type for this usage instance.\r
   ///\r
   public MODULE_TYPE      moduleType;\r
+\r
   ///\r
   /// The value of the PCD in this usage instance. \r
   /// \r
   ///\r
   /// The value of the PCD in this usage instance. \r
   /// \r
-  public Object           datum;\r
+  public String           datum;\r
+\r
+  ///\r
+  /// The maxDatumSize could be different for same PCD in different module\r
+  /// But this case is allow for FeatureFlag, FixedAtBuild, PatchableInModule\r
+  /// type.\r
+  /// \r
+  public int              maxDatumSize;\r
+\r
   ///\r
   /// Autogen string for header file.\r
   ///\r
   public String           hAutogenStr;\r
   ///\r
   /// Autogen string for header file.\r
   ///\r
   public String           hAutogenStr;\r
-  /**\r
-   * Auotgen string for C code file.\r
-   */\r
+\r
+  ///\r
+  /// Auotgen string for C code file.\r
+  /// \r
   public String           cAutogenStr;\r
 \r
   /**\r
      Constructure function\r
      \r
      @param parentToken         Member variable.\r
   public String           cAutogenStr;\r
 \r
   /**\r
      Constructure function\r
      \r
      @param parentToken         Member variable.\r
-     @param pcdType             Member variable.\r
      @param moduleName          Member variable.\r
      @param moduleGUID          Member variable.\r
      @param packageName         Member variable.\r
      @param moduleName          Member variable.\r
      @param moduleGUID          Member variable.\r
      @param packageName         Member variable.\r
@@ -97,9 +115,9 @@ public class UsageInstance {
      @param arch                Member variable.\r
      @param version             Member variable.\r
      @param value               Member variable.\r
      @param arch                Member variable.\r
      @param version             Member variable.\r
      @param value               Member variable.\r
-  **/\r
+     @param maxDatumSize        Member variable.\r
+   */\r
   public UsageInstance (Token             parentToken,\r
   public UsageInstance (Token             parentToken,\r
-                        Token.PCD_TYPE    pcdType,\r
                         String            moduleName,\r
                         UUID              moduleGUID,\r
                         String            packageName,\r
                         String            moduleName,\r
                         UUID              moduleGUID,\r
                         String            packageName,\r
@@ -108,7 +126,8 @@ public class UsageInstance {
                         Token.PCD_TYPE    modulePcdType,\r
                         String            arch,\r
                         String            version,\r
                         Token.PCD_TYPE    modulePcdType,\r
                         String            arch,\r
                         String            version,\r
-                        Object            value) {\r
+                        String            value,\r
+                        int               maxDatumSize) {\r
       this.parentToken      = parentToken;\r
       this.moduleName       = moduleName;\r
       this.moduleGUID       = moduleGUID;\r
       this.parentToken      = parentToken;\r
       this.moduleName       = moduleName;\r
       this.moduleGUID       = moduleGUID;\r
@@ -119,7 +138,7 @@ public class UsageInstance {
       this.arch             = arch;\r
       this.version          = version;\r
       this.datum            = value;\r
       this.arch             = arch;\r
       this.version          = version;\r
       this.datum            = value;\r
-      this.modulePcdType    = pcdType;\r
+      this.maxDatumSize     = maxDatumSize;\r
   }\r
 \r
   /**\r
   }\r
 \r
   /**\r
@@ -266,85 +285,12 @@ public class UsageInstance {
 \r
       break;\r
     case DYNAMIC:\r
 \r
       break;\r
     case DYNAMIC:\r
-      switch(parentToken.pcdType) {\r
-        case FEATURE_FLAG:\r
-          if(isBuildUsedLibrary) {\r
-            hAutogenStr += String.format("extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", \r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",\r
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-          } else {\r
-            hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
-                                         parentToken.cName, \r
-                                         datum.toString());\r
-            hAutogenStr += String.format("extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", \r
-                                         parentToken.cName);\r
-            cAutogenStr += String.format("const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",\r
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-          }\r
-          break;\r
-        case FIXED_AT_BUILD:\r
-          if(isBuildUsedLibrary) {\r
-            hAutogenStr += String.format("extern const %s _gPcd_FixedAtBuild_%s;\r\n",\r
-                                         Token.getAutogendatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",\r
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-\r
-          } else {\r
-            hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
-                                         parentToken.cName, \r
-                                         datum.toString());\r
-            hAutogenStr += String.format("extern const %s _gPcd_FixedAtBuild_%s\r\n",\r
-                                         Token.getAutogendatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName);\r
-            cAutogenStr += String.format("const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",\r
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",\r
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                         parentToken.cName,\r
-                                         parentToken.cName);\r
-          }\r
-          break;\r
-        case PATCHABLE_IN_MODULE:\r
-          hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", \r
-                                       parentToken.cName, \r
-                                       datum.toString());\r
-          hAutogenStr += String.format("extern %s _gPcd_BinaryPatch_%s;\r\n",\r
-                                       Token.getAutogendatumTypeString(parentToken.datumType),\r
-                                       parentToken.cName,\r
-                                       parentToken.cName);\r
-          cAutogenStr += String.format("%s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;",\r
-                                       Token.getAutogendatumTypeString(parentToken.datumType),\r
-                                       parentToken.cName,\r
-                                       parentToken.cName);\r
-          hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",\r
-                                       Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                       parentToken.cName,\r
-                                       parentToken.cName);\r
-          break;\r
-      case DYNAMIC:\r
-          hAutogenStr += String.format("#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",\r
-                                       Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
-                                       parentToken.cName,\r
-                                       Token.getAutogenLibrarydatumTypeString(parentToken.datumType),\r
-                                       parentToken.cName);\r
-          break;\r
-      default:\r
-          throw new EntityException ("The PCD type is unknown");\r
-      }\r
-      break;\r
+       hAutogenStr += String.format("#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",\r
+                                    Token.GetAutogenDefinedatumTypeString(parentToken.datumType),\r
+                                    parentToken.cName,\r
+                                    Token.getAutogenLibrarydatumTypeString(parentToken.datumType),\r
+                                    parentToken.cName);\r
+       break;\r
     case DYNAMIC_EX:\r
       break;\r
     }\r
     case DYNAMIC_EX:\r
       break;\r
     }\r
index 661260d7bb945575a8fd29a2b920565466a47d79..ed282e1b768e72b8d228a2d25b295b85907a169b 100644 (file)
@@ -109,16 +109,8 @@ public class PCDDatabaseFrame extends JFrame {
             tokenNode = new DefaultMutableTreeNode(token.cName);\r
             tokenNode.add(new DefaultMutableTreeNode(String.format("TOKEN NUMBER: 0x%08x", token.tokenNumber)));\r
             tokenNode.add(new DefaultMutableTreeNode("TOKEN SPACE NAME: " + token.tokenSpaceName.toString()));\r
             tokenNode = new DefaultMutableTreeNode(token.cName);\r
             tokenNode.add(new DefaultMutableTreeNode(String.format("TOKEN NUMBER: 0x%08x", token.tokenNumber)));\r
             tokenNode.add(new DefaultMutableTreeNode("TOKEN SPACE NAME: " + token.tokenSpaceName.toString()));\r
-            tokenNode.add(new DefaultMutableTreeNode("PCD TYPE: " + Token.getStringOfpcdType(token.pcdType)));\r
             tokenNode.add(new DefaultMutableTreeNode("DATUM TYPE: " +Token.getStringOfdatumType(token.datumType)));\r
             tokenNode.add(new DefaultMutableTreeNode("DATUM TYPE: " +Token.getStringOfdatumType(token.datumType)));\r
-            tokenNode.add(new DefaultMutableTreeNode("DATUM: " + token.datum.toString()));\r
-            tokenNode.add(new DefaultMutableTreeNode("HIIENABLE: " +(token.hiiEnabled?"true":"false")));\r
-            tokenNode.add(new DefaultMutableTreeNode("VARIABLE NAME: " + token.variableName));\r
             //tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));\r
             //tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));\r
-            tokenNode.add(new DefaultMutableTreeNode("SKUENABLE: " +(token.skuEnabled?"true":"false")));\r
-            tokenNode.add(new DefaultMutableTreeNode(String.format("SKUID: %d", token.skuId)));\r
-            tokenNode.add(new DefaultMutableTreeNode(String.format("MAX SKU COUNT: %d", token.maxSkuCount)));\r
-            tokenNode.add(new DefaultMutableTreeNode("VPDENABLE: " +(token.vpdEnabled?"true":"false")));\r
 \r
             usageNode = new DefaultMutableTreeNode("PRODUCER");\r
             tokenNode.add(usageNode);\r
 \r
             usageNode = new DefaultMutableTreeNode("PRODUCER");\r
             tokenNode.add(usageNode);\r