diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e9cd7d53aa..4e9a2f0246 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -496,145 +496,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>
     </PEI_CORE>
     <PEIM>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdEmulatorPeim">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">
+      </ModuleSA>
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">
         <PcdBuildDeclarations>
@@ -2045,6 +1909,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>
     </DXE_CORE>
     <DXE_DRIVERS>
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">
+      </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">
         <PcdBuildDeclarations>
           <PcdBuildData ItemType="FIXED_AT_BUILD">
@@ -8907,146 +8773,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>
         </PcdBuildDeclarations>
       </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdEmulator">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
-      </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">
         <PcdBuildDeclarations>
           <PcdBuildData ItemType="FIXED_AT_BUILD">
@@ -10632,7 +10358,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>0</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <Token>0x00001000</Token>
       <DatumType>VOID*</DatumType>
@@ -10650,7 +10376,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <Token>0x00001001</Token>
       <DatumType>VOID*</DatumType>
@@ -10668,7 +10394,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtSerialPort</C_Name>
       <Token>0x00001002</Token>
       <DatumType>VOID*</DatumType>
@@ -10686,7 +10412,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"COM1!COM2"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtUga</C_Name>
       <Token>0x00001003</Token>
       <DatumType>VOID*</DatumType>
@@ -10704,7 +10430,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtFileSystem</C_Name>
       <Token>0x00001004</Token>
       <DatumType>VOID*</DatumType>
@@ -10722,7 +10448,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtMemorySize</C_Name>
       <Token>0x00001005</Token>
       <DatumType>VOID*</DatumType>
@@ -10740,6 +10466,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"64!64"</DefaultValue>
     </PcdBuildData>
+    <PcdBuildData ItemType="FIXED_AT_BUILD">
+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
+      <Token>0x00001005</Token>
+      <DatumType>VOID*</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>10</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>L"64!64"</DefaultValue>
+    </PcdBuildData>
     <PcdBuildData ItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtBootMode</C_Name>
       <Token>0x00001006</Token>
@@ -10758,7 +10502,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>1</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuModel</C_Name>
       <Token>0x00001007</Token>
       <DatumType>VOID*</DatumType>
@@ -10776,7 +10520,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <Token>0x00001008</Token>
       <DatumType>VOID*</DatumType>
@@ -10812,7 +10556,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>
     </PcdBuildData>
-    <PcdBuildData ItemType="FIXED_AT_BUILD">
+    <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtConsole</C_Name>
       <Token>0x0000100a</Token>
       <DatumType>VOID*</DatumType>
@@ -10843,7 +10587,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuId>0x00</SkuId>
       <DatumSize>4</DatumSize>
       <VariableGuid>0B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</VariableGuid>
-      <VariableName>L"RothmanVariable"</VariableName>
+      <VariableName>RothmanVariable</VariableName>
       <DataOffset>0</DataOffset>
       <GuidOffset>0</GuidOffset>
       <DefaultValue>0</DefaultValue>
@@ -10920,6 +10664,132 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>
       <DefaultValue>0x0</DefaultValue>
     </PcdBuildData>
+    <PcdBuildData ItemType="FIXED_AT_BUILD">
+      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
+      <Token>0x0001000f</Token>
+      <DatumType>UINT32</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>4</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>0x0</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="FIXED_AT_BUILD">
+      <C_Name>PcdVpdBaseAddress</C_Name>
+      <Token>0x00010010</Token>
+      <DatumType>UINT32</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>4</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>0x0</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint8</C_Name>
+      <Token>0x00011000</Token>
+      <DatumType>UINT8</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>1</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>0x1</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint16</C_Name>
+      <Token>0x00011001</Token>
+      <DatumType>UINT16</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>2</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>0x1234</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint32</C_Name>
+      <Token>0x00011002</Token>
+      <DatumType>UINT32</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>4</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>NoDefault</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicUint64</C_Name>
+      <Token>0x00011003</Token>
+      <DatumType>UINT64</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>8</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>NoDefault</DefaultValue>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdTestDynamicBoolean</C_Name>
+      <Token>0x00011004</Token>
+      <DatumType>BOOLEAN</DatumType>
+      <HiiEnable>false</HiiEnable>
+      <VpdEnable>false</VpdEnable>
+      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
+      <SkuEnable>false</SkuEnable>
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>
+      <MaxSku>0x00</MaxSku>
+      <SkuId>0x00</SkuId>
+      <DatumSize>1</DatumSize>
+      <VariableGuid>0</VariableGuid>
+      <VariableName>L""</VariableName>
+      <DataOffset>0</DataOffset>
+      <GuidOffset>0</GuidOffset>
+      <DefaultValue>NoDefault</DefaultValue>
+    </PcdBuildData>
   </PcdBuildDeclarations>
   <BuildOptions>
     <OutputDirectory IntermediateDirectories="UNIFIED"/>