X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FMdePkg-All-Archs.fpd;h=cf00caa18f727d584bcb25346d5b553edfd4f73a;hp=a25396f038929e7dff1a217d9f04870a08e1c77b;hb=508daae71b4c754321cb28e1fe7671a2ec1374f7;hpb=717841f1d62d4ca9457ccb69873029e24cdf28c9

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index a25396f038..cf00caa18f 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <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">
   <PlatformHeader>
-    <PlatformName>MdePkg</PlatformName>
+    <PlatformName>MdePkgAll</PlatformName>
+    <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>
+    <Version>0.3</Version>
     <Abstract>EFI/Tiano MdePkg Package</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
-    <Created>2006-04-03 13:40</Created>
-    <CreatedBy>lhauch</CreatedBy>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <CreatedDate>2006-04-03 13:40</CreatedDate>
+    <ModifiedDate>2006-05-14 09:49</ModifiedDate>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
@@ -62,7 +65,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />
       
@@ -82,6 +85,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />
+
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" />
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />
   
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />
@@ -130,7 +138,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiSmbusLib" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" />
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />
       
@@ -151,6 +159,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />
   
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" />
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />
   
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiBootServicesTableLib" />
@@ -198,7 +210,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiSmbusLib" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" />
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />
       
@@ -218,6 +230,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />
+
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" />
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
   
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />
   
@@ -267,7 +283,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiSmbusLib" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" />
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />
       
@@ -287,6 +303,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />
+
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" />
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
   
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />
   
@@ -315,446 +335,230 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </SEC>
     <PEI_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_DRIVERS>
     <OTHER_COMPONENTS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -779,104 +583,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -884,26 +642,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -911,7 +659,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" >
       </ModuleSA>        
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" >
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesLib" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" >
       </ModuleSA>        
@@ -921,80 +669,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -1017,47 +729,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
-      </ModuleSA>        
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>        
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>                
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
 
@@ -1070,8 +800,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -1081,114 +809,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -1211,76 +885,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -1305,104 +943,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -1410,26 +1002,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -1437,7 +1019,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmbusLib" >
       </ModuleSA>        
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreLib" >
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesLib" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMemoryLib" >
       </ModuleSA>        
@@ -1447,80 +1029,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -1543,47 +1089,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
-      </ModuleSA>        
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>        
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>                
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
 
@@ -1596,8 +1160,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -1607,114 +1169,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -1737,76 +1245,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -1831,104 +1303,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -1936,26 +1362,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -1963,7 +1379,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeSmbusLib" >
       </ModuleSA>        
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreLib" >
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesLib" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMemoryLib" >
       </ModuleSA>        
@@ -1973,80 +1389,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -2069,47 +1449,65 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
-      </ModuleSA>        
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>       
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>        
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>         
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
 
@@ -2122,8 +1520,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -2133,114 +1529,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -2263,76 +1605,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -2357,104 +1663,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -2462,26 +1722,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -2489,7 +1739,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmbusLib" >
       </ModuleSA>        
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreLib" >
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesLib" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMemoryLib" >
       </ModuleSA>        
@@ -2499,80 +1749,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -2595,46 +1809,64 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>        
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+            <DatumType>UINT8</DatumType>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
+      </ModuleSA>        
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
+            <C_Name>PcdPostCodePropertyMask</C_Name>
+            <Token>0x0000000b</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -2648,8 +1880,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -2659,114 +1889,60 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -2790,188 +1966,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       
     </OTHER_COMPONENTS>  
   </FrameworkModules>
-  <PcdBuildDeclarations>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-      <Token>0x00000001</Token>
-      <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>1000000</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>
-      <Token>0x00000002</Token>
-      <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>1000000</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdMaximumLinkedListLength</C_Name>
-      <Token>0x00000003</Token>
-      <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>1000000</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdSpinLockTimeout</C_Name>
-      <Token>0x00000004</Token>
-      <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>10000000</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <DatumType>UINT8</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0x80000000</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-      <Token>0x00000007</Token>
-      <DatumType>UINT8</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdDebugClearMemoryValue</C_Name>
-      <Token>0x00000008</Token>
-      <DatumType>UINT8</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0xAF</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000009</Token>
-      <DatumType>UINT8</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0x0</DefaultValue>
-    </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
-      <C_Name>PcdPciExpressBaseAddress</C_Name>
-      <Token>0x0000000A</Token>
-      <DatumType>UINT64</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0</MaxSku>
-      <SkuId>0</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0xE0000000</DefaultValue>
-    </PcdBuildData>
-  </PcdBuildDeclarations>
   <BuildOptions>
     <OutputDirectory IntermediateDirectories="UNIFIED"/>
   </BuildOptions>