Fix an assembler warning.

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

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 7870fce130c6cc1992f6c4ffc1a274d1ebf188f7..cf00caa18f727d584bcb25346d5b553edfd4f73a 100644 (file)
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>\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
+<?xml version="1.0" encoding="UTF-8"?>\r

 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
   <PlatformHeader>\r
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
   <PlatformHeader>\r

-    <PlatformName>MdePkg</PlatformName>\r
+    <PlatformName>MdePkgAll</PlatformName>\r
+    <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>\r
+    <Version>0.3</Version>\r

     <Abstract>EFI/Tiano MdePkg Package</Abstract>\r
     <Description>This FPD file is used for Package Level build.</Description>\r
     <Abstract>EFI/Tiano MdePkg Package</Abstract>\r
     <Description>This FPD file is used for Package Level build.</Description>\r

-    <Created>2006-04-03 13:40</Created>\r
-    <CreatedBy>lhauch</CreatedBy>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <License>\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
+    </License>\r
+    <CreatedDate>2006-04-03 13:40</CreatedDate>\r
+    <ModifiedDate>2006-05-14 09:49</ModifiedDate>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r

   </PlatformHeader>\r
   <Flash>\r
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>\r
   </PlatformHeader>\r
   <Flash>\r
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>\r


@@ -62,7 +65,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" />\r

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r


@@ -82,6 +85,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r

+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
+\r

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r


@@ -130,7 +138,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r

-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" />\r

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r


@@ -151,6 +159,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
   \r

+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r
+\r

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiBootServicesTableLib" />\r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiBootServicesTableLib" />\r


@@ -198,7 +210,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r

-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" />\r

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r


@@ -218,6 +230,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r

+\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r

   \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r
   \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
   \r


@@ -267,7 +283,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r

-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" />\r

       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
       \r


@@ -287,6 +303,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r

+\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />\r

   \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r
   \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
   \r


@@ -315,446 +335,230 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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


@@ -779,104 +583,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -884,26 +642,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -911,7 +659,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r

-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" >\r

       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r


@@ -921,80 +669,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -1017,47 +729,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>                \r

       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r


@@ -1070,8 +800,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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


@@ -1081,114 +809,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -1211,76 +885,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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


@@ -1305,104 +943,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -1410,26 +1002,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -1437,7 +1019,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r

-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" >\r

       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r


@@ -1447,80 +1029,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -1543,47 +1089,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>                \r

       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r


@@ -1596,8 +1160,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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


@@ -1607,114 +1169,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -1737,76 +1245,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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


@@ -1831,104 +1303,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -1936,26 +1362,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -1963,7 +1379,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r

-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" >\r

       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r


@@ -1973,80 +1389,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -2069,47 +1449,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
-      </ModuleSA>        \r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>       \r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>         \r

       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
 \r


@@ -2122,8 +1520,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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


@@ -2133,114 +1529,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -2263,76 +1605,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <MaxDatumSize>4</MaxDatumSize>\r
+            <Value>1000000</Value>\r
+          </PcdData>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r

             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r
             <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
             <Token>0x00000002</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdSpinLockTimeout</C_Name>\r
             <Token>0x00000004</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdMaximumLinkedListLength</C_Name>\r
             <Token>0x00000003</Token>\r

+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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


@@ -2357,104 +1663,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
             <Token>0x00000009</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      \r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -2462,26 +1722,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdPciExpressBaseAddress</C_Name>\r
             <Token>0x0000000A</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT64</DatumType>\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


@@ -2489,7 +1739,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" >\r
       </ModuleSA>        \r

-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" >\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" >\r

       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" >\r
       </ModuleSA>        \r


@@ -2499,80 +1749,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -2595,46 +1809,64 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</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
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
             <Token>0x00000007</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x07</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
+            <DatumType>UINT8</DatumType>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r
+      </ModuleSA>        \r
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >\r
+        <PcdBuildDefinition>\r
+          <PcdData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPostCodePropertyMask</C_Name>\r
+            <Token>0x0000000b</Token>\r
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x07</DefaultValue>\r
-          </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+            <MaxDatumSize>1</MaxDatumSize>\r
+            <Value>0x00</Value>\r
+          </PcdData>\r
+        </PcdBuildDefinition>\r

       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r
       </ModuleSA>        \r
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >\r
       </ModuleSA>        \r


@@ -2648,8 +1880,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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


@@ -2659,114 +1889,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r

+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <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
             <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
             <Token>0x00000006</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT32</DatumType>\r
             <DatumType>UINT32</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x80000000</DefaultValue>\r
-          </PcdBuildData>\r
-          <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
             <C_Name>PcdDebugClearMemoryValue</C_Name>\r
             <Token>0x00000008</Token>\r

+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r

             <DatumType>UINT8</DatumType>\r
             <DatumType>UINT8</DatumType>\r

-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-            <SkuEnable>false</SkuEnable>\r
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>1</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <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


@@ -2790,170 +1966,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       \r
     </OTHER_COMPONENTS>  \r
   </FrameworkModules>\r
       \r
     </OTHER_COMPONENTS>  \r
   </FrameworkModules>\r

-  <PcdBuildDeclarations>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-      <Token>0x00000001</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-      <Token>0x00000002</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-      <Token>0x00000003</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdSpinLockTimeout</C_Name>\r
-      <Token>0x00000004</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>10000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x80000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0xAF</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
-      <Token>0x00000009</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0</DefaultValue>\r
-    </PcdBuildData>\r
-  </PcdBuildDeclarations>\r

   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
   </BuildOptions>\r
   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
   </BuildOptions>\r