X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FMdePkg-All-Archs.fpd;h=2c7ed069f50bdd1ec800a05bed6e7298127b3f09;hb=ab1096fdf6d3e2d6acb67e8bdf884af8bbc2d8fe;hp=62aee07ae56ab33375b5f6e4d1f7b110a1d520b8;hpb=6ff7a41cb8b4e16800f70fd72e7290a418d4329e;p=mirror_edk2.git

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 62aee07ae5..2c7ed069f5 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -71,7 +71,7 @@
       
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" />
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" />
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeimEntryPoint" />
       
@@ -86,9 +86,9 @@
       <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="BasePostCodeLibPort80" />
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" />
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />
   
@@ -144,7 +144,7 @@
       
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" />
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeimEntryPoint" />
       
@@ -159,9 +159,9 @@
       <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="BasePostCodeLibPort80" />
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
-      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" />
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />
   
@@ -216,7 +216,7 @@
       
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" />
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeimEntryPoint" />
       
@@ -231,9 +231,9 @@
       <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="BasePostCodeLibPort80" />
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
-      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" />
   
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />
   
@@ -289,7 +289,7 @@
       
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" />
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeimEntryPoint" />
       
@@ -304,9 +304,9 @@
       <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="BasePostCodeLibPort80" />
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" />
-      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" />
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" />
   
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />
   
@@ -339,6 +339,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -346,6 +347,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -353,6 +355,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -360,6 +363,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -373,6 +377,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -380,6 +385,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -387,6 +393,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -394,6 +401,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -407,6 +415,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -414,6 +423,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -421,6 +431,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -428,6 +439,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -441,6 +453,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -448,6 +461,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -455,6 +469,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -462,6 +477,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -475,6 +491,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -482,6 +499,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -489,6 +507,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -496,6 +515,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -509,6 +529,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -516,6 +537,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -523,6 +545,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -530,6 +553,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -563,6 +587,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -570,6 +595,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -577,6 +603,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -588,6 +615,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0</Value>
@@ -601,6 +629,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -617,6 +646,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -643,17 +673,19 @@
           <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="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -661,6 +693,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -668,6 +701,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -699,6 +733,7 @@
           <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>
@@ -710,28 +745,31 @@
           <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="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >
         <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" >
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" >
         <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>
@@ -743,6 +781,7 @@
           <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>
@@ -774,6 +813,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -781,6 +821,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -788,6 +829,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -799,6 +841,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -806,6 +849,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -813,6 +857,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -844,6 +889,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -851,6 +897,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -858,6 +905,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -865,6 +913,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -898,6 +947,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -905,6 +955,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -912,6 +963,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -923,6 +975,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0</Value>
@@ -936,6 +989,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -952,6 +1006,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -978,17 +1033,19 @@
           <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="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -996,6 +1053,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1003,6 +1061,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1034,6 +1093,7 @@
           <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>
@@ -1045,28 +1105,31 @@
           <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="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >
         <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" >
+      <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" >
         <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>
@@ -1078,6 +1141,7 @@
           <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>
@@ -1109,6 +1173,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1116,6 +1181,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1123,6 +1189,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1134,6 +1201,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1141,6 +1209,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1148,6 +1217,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1179,6 +1249,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1186,6 +1257,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1193,6 +1265,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -1200,6 +1273,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1233,6 +1307,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1240,6 +1315,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1247,6 +1323,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1258,6 +1335,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0</Value>
@@ -1271,6 +1349,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -1287,6 +1366,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -1313,17 +1393,19 @@
           <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="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1331,6 +1413,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1338,6 +1421,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1369,6 +1453,7 @@
           <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>
@@ -1380,28 +1465,31 @@
           <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="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >
         <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" >
+      <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" >
         <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>
@@ -1413,6 +1501,7 @@
           <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>
@@ -1444,6 +1533,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1451,6 +1541,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1458,6 +1549,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1469,6 +1561,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1476,6 +1569,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1483,6 +1577,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1514,6 +1609,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1521,6 +1617,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1528,6 +1625,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>10000000</Value>
@@ -1535,6 +1633,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
+            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>1000000</Value>
@@ -1568,6 +1667,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1575,6 +1675,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1582,6 +1683,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1593,6 +1695,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0</Value>
@@ -1606,6 +1709,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -1622,6 +1726,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT64</DatumType>
             <MaxDatumSize>8</MaxDatumSize>
             <Value>0xE0000000</Value>
@@ -1648,17 +1753,19 @@
           <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="BaseDebugLibReportStatusCode" >
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiDxeDebugLibReportStatusCode" >
         <PcdBuildDefinition>
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1666,6 +1773,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1673,6 +1781,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1704,6 +1813,7 @@
           <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>
@@ -1715,28 +1825,31 @@
           <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" >
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibPort80" >
         <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" >
+      <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiDxePostCodeLibReportStatusCode" >
         <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>
@@ -1748,6 +1861,7 @@
           <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>
@@ -1779,6 +1893,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1786,6 +1901,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1793,6 +1909,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>
@@ -1804,6 +1921,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
+            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0x0f</Value>
@@ -1811,6 +1929,7 @@
           <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
             <MaxDatumSize>4</MaxDatumSize>
             <Value>0x80000000</Value>
@@ -1818,6 +1937,7 @@
           <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
             <MaxDatumSize>1</MaxDatumSize>
             <Value>0xAF</Value>