1, Add Guid declaration into EdkModulePkg.spd, EdkNt32Pkg.spd and MdePkg.spd file

2, Correct Guid CName field for all PCDs in EdkModule.pkg, EdkModulePkg-All-Archs.fpd, Nt32.fpd, Mde.fpd, MdePkg-All-Archs.fpd

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

EdkModulePkg/EdkModulePkg.spd

@@ -174,6 +174,11 @@
     <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
+    <Entry Name="EdkModulePkgTokenSpace">
+      <C_Name>gEfiEdkModulePkgTokenSpaceGuid</C_Name>
+      <GuidValue>8CC4092F-F60E-46d1-B41C-1E761DF50582</GuidValue>
+      <HelpText>All PCD define in EdkModulePkg is in this token space scope</HelpText>
+    </Entry>  
     <Entry Name="PcdDataBaseHob">
       <C_Name>gPcdDataBaseHobGuid</C_Name>
       <GuidValue>EA296D92-0B69-423C-8C28-33B4E0A91268</GuidValue>

EdkNt32Pkg/EdkNt32Pkg.spd

@@ -73,6 +73,11 @@
     <IncludePkgHeader ModuleType="USER_DEFINED">Include/WinNtPeim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
+    <Entry Name="EdkModulePkgTokenSpace">
+      <C_Name>gEfiEdkNt32PkgTokenSpaceGuid</C_Name>
+      <GuidValue>0D79A645-1D91-40a6-A81F-61E6982B32B4</GuidValue>
+      <HelpText>All PCD define in EdkNt32Pkg is in this token space scope</HelpText>
+    </Entry>  
     <Entry Name="WinNtVirtualDisks">
       <C_Name>gEfiWinNtVirtualDisksGuid</C_Name>
       <GuidValue>0C95A928-A006-11D4-BCFA-0080C73C8881</GuidValue>

MdePkg/MdePkg-All-Archs.fpd

@@ -7,12 +7,12 @@
     <Abstract>EFI/Tiano MdePkg Package</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
+    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
+      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
+      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
+      http://opensource.org/licenses/bsd-license.php
-
+
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      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>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
@@ -31,7 +31,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
@@ -39,7 +39,7 @@
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000002</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -47,7 +47,7 @@
           <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
@@ -55,7 +55,7 @@
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
         </PcdData>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
@@ -71,7 +71,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
@@ -79,7 +79,7 @@
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
@@ -87,7 +87,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -95,7 +95,7 @@
           <Token>0x00000004</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
         </PcdData>
@@ -111,7 +111,7 @@
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
@@ -119,7 +119,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
@@ -127,7 +127,7 @@
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000002</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -135,7 +135,7 @@
           <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
@@ -151,7 +151,7 @@
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -159,7 +159,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
@@ -167,7 +167,7 @@
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
@@ -175,7 +175,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -191,7 +191,7 @@
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -199,7 +199,7 @@
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
@@ -207,7 +207,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
@@ -215,7 +215,7 @@
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000002</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -231,7 +231,7 @@
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
         </PcdData>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
@@ -239,7 +239,7 @@
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -247,7 +247,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
@@ -255,7 +255,7 @@
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
@@ -331,7 +331,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -339,7 +339,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -347,7 +347,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8">
@@ -363,7 +363,7 @@
         </PcdData>
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000006</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -385,7 +385,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
@@ -413,7 +413,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPciExpressBaseAddress</C_Name>
           <Token>0x0000000A</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT64</DatumType>
           <MaxDatumSize>8</MaxDatumSize>
@@ -471,7 +471,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -487,7 +487,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e6e9c1f8-2c8a-4f4b-a27c-c382e4bb8e67">
@@ -495,7 +495,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -503,7 +503,7 @@
           <Token>0x00000007</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x07</Value>
         </PcdData>
@@ -573,7 +573,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -589,7 +589,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e94cd42a-3aad-4ea0-9b09-945891c60ccd">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -605,7 +605,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
@@ -621,7 +621,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">
       <PcdBuildDefinition>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
@@ -637,7 +637,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b6e9a733-eb75-41b6-b30c-009bcf3801c8">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
           <Token>0x0000000b</Token>
@@ -695,7 +695,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="79C5C7B7-1083-42a6-AD15-2A4E7C4274D7">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -703,7 +703,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8">
       <ModuleSaBuildOptions>
@@ -711,7 +711,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -727,7 +727,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a">
       <PcdBuildDefinition>
@@ -735,7 +735,7 @@
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
@@ -743,7 +743,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
@@ -813,7 +813,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -821,7 +821,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9ae5147d-b240-467f-a484-b024fdc42ee0">
       <ModuleSaBuildOptions>
@@ -829,7 +829,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -837,7 +837,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="050EB8C6-C12E-4b86-892B-40985E8B3137">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -907,7 +907,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="65a18235-5096-4032-8c63-214f0249ce8d">
       <ModuleSaBuildOptions>
@@ -915,7 +915,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="123dd843-57c9-4158-8418-ce68b3944ce7">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -923,7 +923,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -939,7 +939,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -961,7 +961,7 @@
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        </PcdData>
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
@@ -989,7 +989,7 @@
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
           <Token>0x00000009</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
@@ -1047,7 +1047,7 @@
 
           <DatumType>UINT64</DatumType>
           <MaxDatumSize>8</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>0xE0000000</Value>
         </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
@@ -1063,7 +1063,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="51C4C059-67F0-4e3c-9A55-FF42A8291C8C">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -1071,7 +1071,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c">
       <ModuleSaBuildOptions>
@@ -1079,7 +1079,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1149,7 +1149,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b3b0654a-969d-4096-86cb-27e262a02083">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1165,7 +1165,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558">
       <ModuleSaBuildOptions>
@@ -1181,7 +1181,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="882ee1a3-35b2-412c-b8a2-7a8d34a7c390">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -1197,7 +1197,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1213,7 +1213,7 @@
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x07</Value>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1271,7 +1271,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="19e3bbba-beb1-43e8-b32d-9acbb22c7639">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
@@ -1279,7 +1279,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT8</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
         </PcdData>
       </PcdBuildDefinition>
@@ -1287,7 +1287,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1303,7 +1303,7 @@
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8">
@@ -1311,7 +1311,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1319,7 +1319,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -1389,7 +1389,7 @@
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>
@@ -1397,7 +1397,7 @@
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="af97eb89-4cc6-45f8-a514-ca025b346480">
@@ -1405,7 +1405,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9dbf6f25-0da2-4a1d-8e12-e78de6ab4d0e">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1413,7 +1413,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -1489,7 +1489,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>
       </PcdBuildDefinition>
@@ -1497,7 +1497,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1505,7 +1505,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e7884bf4-51a1-485b-982a-ff89129983bc">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -1521,7 +1521,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="123dd843-57c9-4158-8418-ce68b3944ce7">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1543,7 +1543,7 @@
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb">
@@ -1571,7 +1571,7 @@
         </PcdData>
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000006</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -1629,7 +1629,7 @@
         </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -1645,7 +1645,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="287e50f4-a188-4699-b907-3e4080ca5688">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPciExpressBaseAddress</C_Name>
@@ -1653,7 +1653,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT64</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>8</MaxDatumSize>
           <Value>0xE0000000</Value>
         </PcdData>
       </PcdBuildDefinition>
@@ -1661,7 +1661,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="4c38a173-b317-4f29-a7bf-1cc7e10ccb10">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1731,7 +1731,7 @@
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        </PcdData>
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
@@ -1747,7 +1747,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT8</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>
         </PcdData>
       </PcdBuildDefinition>
@@ -1763,7 +1763,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -1779,7 +1779,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
@@ -1795,7 +1795,7 @@
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="baa1baa3-0a8d-402c-8042-985115fae953">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e94cd42a-3aad-4ea0-9b09-945891c60ccd">
@@ -1853,7 +1853,7 @@
 
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>0x00</Value>
         </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
@@ -1861,7 +1861,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e062c52d-78dc-4cc5-b246-b13497a8123c">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
@@ -1869,7 +1869,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT8</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
         </PcdData>
       </PcdBuildDefinition>
@@ -1885,7 +1885,7 @@
           <Token>0x0000000b</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
         </PcdData>
@@ -1893,7 +1893,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556">
       <ModuleSaBuildOptions>
@@ -1901,7 +1901,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="79C5C7B7-1083-42a6-AD15-2A4E7C4274D7">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1971,7 +1971,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="5cddfaf3-e9a7-4d16-bdce-1e002df475bb">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -1979,7 +1979,7 @@
           <Token>0x00000005</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
         </PcdData>
@@ -1987,7 +1987,7 @@
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
@@ -1995,7 +1995,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
@@ -2065,7 +2065,7 @@
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x00000001</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
@@ -2073,7 +2073,7 @@
           <Value>1000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
@@ -2081,7 +2081,7 @@
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
@@ -2097,7 +2097,7 @@
 
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>1000000</Value>
         </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
@@ -2119,7 +2119,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="65a18235-5096-4032-8c63-214f0249ce8d">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -2147,7 +2147,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -2205,7 +2205,7 @@
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0</Value>
         </PcdData>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -2221,7 +2221,7 @@
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPciExpressBaseAddress</C_Name>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Token>0x0000000A</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT64</DatumType>
@@ -2229,7 +2229,7 @@
           <Value>0xE0000000</Value>
         </PcdData>
       </PcdBuildDefinition>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
@@ -2237,7 +2237,7 @@
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="28bde99c-e8a7-4e3e-9a8a-e66cd64f31c6">
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="472ab06d-9810-4c00-bb7f-dad1828fc1ab">
@@ -2307,7 +2307,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4">
       <PcdBuildDefinition>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
@@ -2323,7 +2323,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
@@ -2339,7 +2339,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
           <DatumType>UINT32</DatumType>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -2355,7 +2355,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b3b0654a-969d-4096-86cb-27e262a02083">
       <ModuleSaBuildOptions>
@@ -2371,7 +2371,7 @@
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="d258d6af-2fc0-4019-9c1f-1101c3dd19b5">
       <ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+        <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -2429,7 +2429,7 @@
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3">
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
@@ -2437,7 +2437,7 @@
 
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <Value>0x07</Value>
         </PcdData>
       </PcdBuildDefinition>
       <ModuleSaBuildOptions>
@@ -2445,7 +2445,7 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
     </ModuleSA>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b6e9a733-eb75-41b6-b30c-009bcf3801c8">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
@@ -2461,7 +2461,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
       </ModuleSaBuildOptions>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+    </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="e062c52d-78dc-4cc5-b246-b13497a8123c">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
@@ -2469,7 +2469,7 @@
           <Token>0x0000000b</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
 
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
         </PcdData>
@@ -2477,7 +2477,7 @@
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+      </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="19e3bbba-beb1-43e8-b32d-9acbb22c7639">
       <PcdBuildDefinition>

MdePkg/MdePkg.fpd

@@ -31,7 +31,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -39,7 +39,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -47,7 +47,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -55,7 +55,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -71,7 +71,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -79,7 +79,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -87,7 +87,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -95,7 +95,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -111,7 +111,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -119,7 +119,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -127,7 +127,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -135,7 +135,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -151,7 +151,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -159,7 +159,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -167,7 +167,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -175,7 +175,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -191,7 +191,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -199,7 +199,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -207,7 +207,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -215,7 +215,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -231,7 +231,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
           <Token>0x00000001</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -239,7 +239,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumAsciiStringLength</C_Name>
           <Token>0x00000002</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -247,7 +247,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdSpinLockTimeout</C_Name>
           <Token>0x00000004</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>10000000</Value>
@@ -255,7 +255,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumLinkedListLength</C_Name>
           <Token>0x00000003</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
@@ -331,7 +331,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
@@ -339,7 +339,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
@@ -347,7 +347,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>
@@ -363,7 +363,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
           <Token>0x00000009</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0</Value>
@@ -385,7 +385,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPciExpressBaseAddress</C_Name>
           <Token>0x0000000A</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT64</DatumType>
           <MaxDatumSize>8</MaxDatumSize>
           <Value>0xE0000000</Value>
@@ -413,7 +413,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPciExpressBaseAddress</C_Name>
           <Token>0x0000000A</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT64</DatumType>
           <MaxDatumSize>8</MaxDatumSize>
           <Value>0xE0000000</Value>
@@ -471,7 +471,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x07</Value>
@@ -487,7 +487,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
@@ -495,7 +495,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
@@ -503,7 +503,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>
@@ -573,7 +573,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x07</Value>
@@ -589,7 +589,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>
           <Token>0x00000007</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x07</Value>
@@ -605,7 +605,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
           <Token>0x0000000b</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
@@ -621,7 +621,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
           <Token>0x0000000b</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
@@ -637,7 +637,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdPostCodePropertyMask</C_Name>
           <Token>0x0000000b</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x00</Value>
@@ -701,7 +701,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
@@ -709,7 +709,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
@@ -717,7 +717,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>
@@ -733,7 +733,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugPropertyMask</C_Name>
           <Token>0x00000005</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0x0f</Value>
@@ -741,7 +741,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">
           <C_Name>PcdDebugPrintErrorLevel</C_Name>
           <Token>0x00000006</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>0x80000000</Value>
@@ -749,7 +749,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdDebugClearMemoryValue</C_Name>
           <Token>0x00000008</Token>
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT8</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <Value>0xAF</Value>

MdePkg/MdePkg.spd

@@ -255,6 +255,11 @@
     <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
+    <Entry Name="MdePkgTokenSpace">
+      <C_Name>gEfiMdePkgTokenSpaceGuid</C_Name>
+      <GuidValue>914AEBE7-4635-459b-AA1C-11E219B03A10</GuidValue>
+      <HelpText>All PCD define in MdePkg is in this token space scope</HelpText>
+    </Entry>
     <Entry Name="Acpi10Table">
       <C_Name>gEfiAcpi10TableGuid</C_Name>
       <GuidValue>EB9D2D30-2D88-11D3-9A16-0090273FC14D</GuidValue>