Add <TokenSpaceGuid> for all PCD entry in FPD file

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

2 files changed, 165 insertions, 0 deletions

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 62aee07ae5..cf00caa18f 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -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,6 +673,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>

@@ -654,6 +685,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>

@@ -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,6 +745,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>

@@ -721,6 +757,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>

@@ -732,6 +769,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>

@@ -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,6 +1033,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>

@@ -989,6 +1045,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>

@@ -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,6 +1105,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>

@@ -1056,6 +1117,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>

@@ -1067,6 +1129,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>

@@ -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,6 +1393,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>

@@ -1324,6 +1405,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>

@@ -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,6 +1465,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>

@@ -1391,6 +1477,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>

@@ -1402,6 +1489,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>

@@ -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,6 +1753,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>

@@ -1659,6 +1765,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>

@@ -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,6 +1825,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>

@@ -1726,6 +1837,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>

@@ -1737,6 +1849,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>

@@ -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>

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index be98926e7d..8eb0188d60 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -117,6 +117,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>

@@ -124,6 +125,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>

@@ -131,6 +133,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>

@@ -138,6 +141,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>

@@ -151,6 +155,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>

@@ -158,6 +163,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>

@@ -165,6 +171,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>

@@ -172,6 +179,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>

@@ -185,6 +193,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>

@@ -192,6 +201,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>

@@ -199,6 +209,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>

@@ -206,6 +217,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>

@@ -219,6 +231,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>

@@ -226,6 +239,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>

@@ -233,6 +247,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>

@@ -240,6 +255,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>

@@ -253,6 +269,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>

@@ -260,6 +277,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>

@@ -267,6 +285,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>

@@ -274,6 +293,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>

@@ -287,6 +307,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>

@@ -294,6 +315,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>

@@ -301,6 +323,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>

@@ -308,6 +331,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>

@@ -341,6 +365,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>

@@ -348,6 +373,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>

@@ -355,6 +381,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>

@@ -366,6 +393,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>

@@ -379,6 +407,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>

@@ -395,6 +424,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>

@@ -421,6 +451,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>

@@ -432,6 +463,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>

@@ -439,6 +471,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>

@@ -446,6 +479,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>

@@ -477,6 +511,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>

@@ -488,6 +523,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>

@@ -499,6 +535,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>

@@ -510,6 +547,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>

@@ -521,6 +559,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>

@@ -552,6 +591,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>

@@ -559,6 +599,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>

@@ -566,6 +607,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>

@@ -577,6 +619,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>

@@ -584,6 +627,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>

@@ -591,6 +635,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>