Fix some bugs for EdkFatPkg

[mirror_edk2.git] / EdkNt32Pkg / Nt32.fpd

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e9cd7d53aa0f63c5fc837de4e1b433ed155c5ab6..b8a9f1b19e8001589621e6325ab5b5888b17facb 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1,21 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
   <PlatformHeader>\r
     <PlatformName>NT32</PlatformName>\r
-    <Abstract>EFI/Tiano Emulation Platform</Abstract>\r
-    <Description>The Emulation Platform can be used to debug individual modules, prior to creating a real platform. This also provides an example for how an FPD is created.</Description>\r
-    <Created>2006-02-23 18:21</Created>\r
-    <CreatedBy>lhauch</CreatedBy>\r
+    <GuidValue>eb216561-961f-47ee-9ef9-ca426ef547c2</GuidValue>\r
+    <Version>0.3</Version>\r
+    <Abstract>EFI/Framework Emulation Platform</Abstract>\r
+    <Description>\r
+      The Emulation Platform can be used to debug individual modules, prior to creating\r
+      a real platform. This also provides an example for how an FPD is created.\r
+    </Description>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved. This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the BSD License\r
+      which accompanies this distribution.  The full text of the license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <CreatedDate>2006-02-23 18:21</CreatedDate>\r
+    <ModifiedDate>2006-06-03 20:20</ModifiedDate>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
   <Flash>\r
     <FlashDefinitionFile>FlashMap.fdf</FlashDefinitionFile>\r
@@ -116,10 +122,114 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Capsules>\r
   </Flash>\r
   <TianoImage>\r
+    <SEC>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain"/>\r
+    </SEC>\r
+    <PEI_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiMain">\r
+        <Includes>\r
+          <Arch ArchType="IA32">\r
+            <PackageName>EdkNt32Pkg</PackageName>\r
+          </Arch>\r
+        </Includes>\r
+        <Libraries>\r
+          <Arch ArchType="IA32">\r
+            <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>\r
+          </Arch>\r
+        </Libraries>\r
+      </ModuleSA>\r
+    </PEI_CORE>\r
+    <PEIM>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">\r
+        <Libraries>\r
+          <Arch ArchType="IA32">\r
+            <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>\r
+          </Arch>\r
+        </Libraries>\r
+      </ModuleSA>\r
+    </PEIM>\r
+    <DXE_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain"/>\r
+    </DXE_CORE>\r
+    <DXE_DRIVERS>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub"/>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort"/>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat"/>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld"/>\r
+    </DXE_DRIVERS>\r
+  </TianoImage>\r
+  <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain">\r
         <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
             <DatumType>UINT32</DatumType>\r
@@ -168,7 +278,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -238,7 +348,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+          <PcdBuildData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtCpuModel</C_Name>\r
             <Token>0x00001007</Token>\r
             <DatumType>VOID*</DatumType>\r
@@ -306,7 +416,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>0xAF</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+          <PcdBuildData ItemType="DYNAMIC">\r
             <C_Name>PcdWinNtMemorySize</C_Name>\r
             <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
@@ -323,6 +433,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>L"64!64"</DefaultValue>\r
           </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
+            <Token>0x00001005</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>10</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>L"64!64"</DefaultValue>\r
+          </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
     </SEC>\r
@@ -405,7 +533,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -496,7 +624,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>\r
     </PEI_CORE>\r
     <PEIM>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdEmulatorPeim">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -532,6 +660,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
+            <Token>0x0001000f</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x8</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdVpdBaseAddress</C_Name>\r
+            <Token>0x00010010</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x0</DefaultValue>\r
+          </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
@@ -547,7 +711,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -636,7 +800,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -687,7 +851,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -774,9 +938,99 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>0xAF</DefaultValue>\r
           </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdTestDynamicUint8</C_Name>\r
+            <Token>0x00011000</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x1</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdTestDynamicUint16</C_Name>\r
+            <Token>0x00011001</Token>\r
+            <DatumType>UINT16</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>2</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x1234</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdTestDynamicUint32</C_Name>\r
+            <Token>0x00011002</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>NoDefault</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdTestDynamicUint64</C_Name>\r
+            <Token>0x00011003</Token>\r
+            <DatumType>UINT64</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>8</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>NoDefault</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdTestDynamicBoolean</C_Name>\r
+            <Token>0x00011004</Token>\r
+            <DatumType>BOOLEAN</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>NoDefault</DefaultValue>\r
+          </PcdBuildData>\r
+        </PcdBuildDeclarations>      \r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -827,7 +1081,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -916,7 +1170,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -967,7 +1221,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1056,7 +1310,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1107,7 +1361,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1196,7 +1450,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1247,7 +1501,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1336,7 +1590,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1387,7 +1641,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1476,7 +1730,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1527,7 +1781,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1616,7 +1870,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1667,7 +1921,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1756,12 +2010,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">\r
-        <Libraries>\r
-          <Arch ArchType="IA32">\r
-            <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>\r
-          </Arch>\r
-        </Libraries>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1812,7 +2061,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -1901,9 +2150,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-    </PEIM>\r
-    <DXE_CORE>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">\r
+        <Libraries>\r
+          <Arch ArchType="IA32">\r
+            <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>\r
+          </Arch>\r
+        </Libraries>\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1954,7 +2206,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2043,10 +2295,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-    </DXE_CORE>\r
-    <DXE_DRIVERS>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\r
+    </PEIM>\r
+    <DXE_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">\r
         <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
+            <Token>0x00000009</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0</DefaultValue>\r
+          </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
@@ -2096,7 +2366,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2185,7 +2455,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">\r
+    </DXE_CORE>\r
+    <DXE_DRIVERS>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2221,6 +2493,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
+            <Token>0x0001000f</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x8</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdVpdBaseAddress</C_Name>\r
+            <Token>0x00010010</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x0</DefaultValue>\r
+          </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdDebugPropertyMask</C_Name>\r
             <Token>0x00000005</Token>\r
@@ -2236,7 +2544,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2325,7 +2633,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2376,7 +2684,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2465,7 +2773,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2516,7 +2824,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2605,7 +2913,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2656,7 +2964,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2745,7 +3053,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2796,7 +3104,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -2885,7 +3193,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2936,7 +3244,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3025,7 +3333,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3076,7 +3384,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3165,12 +3473,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <DatumType>UINT32</DatumType>\r
+            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
+            <Token>0x00000009</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+            <Token>0x00000001</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -3216,7 +3542,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3305,7 +3631,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3356,7 +3682,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3445,7 +3771,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3496,7 +3822,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3585,7 +3911,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3636,7 +3962,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3725,7 +4051,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3776,7 +4102,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -3865,7 +4191,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3916,7 +4242,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4005,7 +4331,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4056,7 +4382,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4145,7 +4471,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4196,7 +4522,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4285,7 +4611,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4336,7 +4662,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4425,7 +4751,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4476,7 +4802,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4565,7 +4891,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4616,7 +4942,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4705,7 +5031,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4756,7 +5082,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4845,7 +5171,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4896,7 +5222,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -4985,7 +5311,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5036,7 +5362,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5125,7 +5451,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5176,7 +5502,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5265,7 +5591,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5316,7 +5642,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5405,7 +5731,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5456,7 +5782,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5545,7 +5871,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5596,7 +5922,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5685,7 +6011,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5736,7 +6062,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5825,7 +6151,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5876,7 +6202,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -5965,7 +6291,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6016,7 +6342,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6105,9 +6431,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6158,7 +6482,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6247,7 +6571,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6298,7 +6622,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6387,7 +6711,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6438,7 +6764,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6527,7 +6853,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6578,7 +6904,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6667,7 +6993,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6718,7 +7044,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6807,7 +7133,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6858,7 +7184,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -6947,7 +7273,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6998,7 +7324,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7087,7 +7413,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7138,7 +7464,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7227,8 +7553,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">\r
         <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
+            <Token>0x00000009</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0</DefaultValue>\r
+          </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
             <Token>0x00000001</Token>\r
@@ -7278,7 +7622,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7367,7 +7711,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7418,7 +7762,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7507,7 +7851,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7558,7 +7902,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7647,7 +7991,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7698,7 +8042,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7787,7 +8131,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7838,7 +8182,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -7927,7 +8271,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7978,7 +8322,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8067,7 +8411,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8118,7 +8462,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8207,7 +8551,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8258,7 +8602,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8347,7 +8691,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8398,7 +8742,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8487,7 +8831,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8538,7 +8882,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8627,7 +8971,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8678,7 +9022,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8767,7 +9111,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8818,7 +9162,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -8907,7 +9251,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdEmulator">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8958,7 +9302,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9047,7 +9391,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9098,7 +9442,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9187,7 +9531,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9238,7 +9582,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9325,10 +9669,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <DataOffset>0</DataOffset>\r
             <DefaultValue>0xAF</DefaultValue>\r
           </PcdBuildData>\r
+        </PcdBuildDeclarations>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">\r
+        <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtMemorySize</C_Name>\r
-            <Token>0x00001005</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+            <Token>0x00000001</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9336,16 +9684,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>10</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"64!64"</DefaultValue>\r
+            <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
-            <Token>0x00001000</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+            <Token>0x00000002</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9353,16 +9701,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>24</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+            <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtVirtualDisk</C_Name>\r
-            <Token>0x00001001</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdDebugPropertyMask</C_Name>\r
+            <Token>0x00000005</Token>\r
+            <DatumType>UINT8</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9370,16 +9718,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>24</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtSerialPort</C_Name>\r
-            <Token>0x00001002</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdSpinLockTimeout</C_Name>\r
+            <Token>0x00000004</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9387,17 +9735,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>20</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <GuidOffset>0</GuidOffset>\r
-            <DefaultValue>L"COM1!COM2"</DefaultValue>\r
+            <DefaultValue>10000000</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtUga</C_Name>\r
-            <Token>0x00001003</Token>\r
-            <DatumType>VOID*</DatumType>\r
+          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
+            <Token>0x00000006</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9405,16 +9752,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>50</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
+            <DefaultValue>0x80000000</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtCpuModel</C_Name>\r
-            <Token>0x00001007</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
+            <Token>0x00000007</Token>\r
+            <DatumType>UINT8</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9422,16 +9769,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>48</DatumSize>\r
+            <DatumSize>1</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+            <DefaultValue>0x07</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtFileSystem</C_Name>\r
-            <Token>0x00001004</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+            <Token>0x00000003</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9439,32 +9786,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>120</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
+            <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtCpuModel</C_Name>\r
-            <Token>0x00001007</Token>\r
-            <DatumType>VOID*</DatumType>\r
+            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
+            <Token>0x00000008</Token>\r
+            <DatumType>UINT8</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
             <SkuEnable>false</SkuEnable>\r
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-            <MaxSku>0x00</MaxSku>\r
-            <SkuId>0x00</SkuId>\r
-            <DatumSize>48</DatumSize>\r
+            <MaxSku>0</MaxSku>\r
+            <SkuId>0</SkuId>\r
+            <DatumSize>1</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+            <DefaultValue>0xAF</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtConsole</C_Name>\r
-            <Token>0x0000100a</Token>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtMemorySize</C_Name>\r
+            <Token>0x00001005</Token>\r
             <DatumType>VOID*</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
@@ -9473,20 +9820,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>50</DatumSize>\r
+            <DatumSize>10</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
+            <DefaultValue>L"64!64"</DefaultValue>\r
           </PcdBuildData>\r
-        </PcdBuildDeclarations>\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">\r
-        <PcdBuildDeclarations>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <DatumType>UINT32</DatumType>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
+            <Token>0x00001000</Token>\r
+            <DatumType>VOID*</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9494,16 +9837,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
+            <DatumSize>24</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
+            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <DatumType>UINT32</DatumType>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtVirtualDisk</C_Name>\r
+            <Token>0x00001001</Token>\r
+            <DatumType>VOID*</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9511,18 +9854,373 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
             <MaxSku>0x00</MaxSku>\r
             <SkuId>0x00</SkuId>\r
-            <DatumSize>4</DatumSize>\r
+            <DatumSize>24</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
+            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <DatumType>UINT8</DatumType>\r
-            <HiiEnable>false</HiiEnable>\r
-            <VpdEnable>false</VpdEnable>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtSerialPort</C_Name>\r
+            <Token>0x00001002</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>20</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>L"COM1!COM2"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtUga</C_Name>\r
+            <Token>0x00001003</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>50</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtCpuModel</C_Name>\r
+            <Token>0x00001007</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>48</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtFileSystem</C_Name>\r
+            <Token>0x00001004</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>120</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtConsole</C_Name>\r
+            <Token>0x0000100a</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>50</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtCpuSpeed</C_Name>\r
+            <Token>0x00001008</Token>\r
+            <DatumType>VOID*</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>8</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>L"3000"</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FEATURE_FLAG">\r
+            <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
+            <Token>0x0001000d</Token>\r
+            <DatumType>BOOLEAN</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x1</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
+            <Token>0x0001000b</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x1234</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
+            <Token>0x0001000c</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x5678</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="DYNAMIC">\r
+            <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
+            <Token>0x0001000e</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0x0</DefaultValue>\r
+          </PcdBuildData>\r
+          \r
+        </PcdBuildDeclarations>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">\r
+        <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+            <Token>0x00000001</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>1000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+            <Token>0x00000002</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>1000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdDebugPropertyMask</C_Name>\r
+            <Token>0x00000005</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>0x1f</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdSpinLockTimeout</C_Name>\r
+            <Token>0x00000004</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>10000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
+            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
+            <Token>0x00000006</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>0x80000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
+            <Token>0x00000007</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>0x07</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
+            <Token>0x00000003</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>1000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
+            <Token>0x00000008</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0</MaxSku>\r
+            <SkuId>0</SkuId>\r
+            <DatumSize>1</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>0xAF</DefaultValue>\r
+          </PcdBuildData>\r
+        </PcdBuildDeclarations>\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">\r
+        <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
+            <Token>0x00000001</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>1000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
+            <Token>0x00000002</Token>\r
+            <DatumType>UINT32</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
+            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>1000000</DefaultValue>\r
+          </PcdBuildData>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdDebugPropertyMask</C_Name>\r
+            <Token>0x00000005</Token>\r
+            <DatumType>UINT8</DatumType>\r
+            <HiiEnable>false</HiiEnable>\r
+            <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
             <SkuEnable>false</SkuEnable>\r
             <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
@@ -9532,7 +10230,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9621,7 +10319,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9672,7 +10370,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9761,7 +10459,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9812,7 +10510,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -9901,7 +10599,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9952,7 +10650,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -10041,7 +10739,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -10092,7 +10790,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -10181,7 +10879,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">\r
+      </ModuleSA>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -10232,7 +10932,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -10321,10 +11021,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">\r
-      </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
@@ -10376,7 +11072,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x0f</DefaultValue>\r
+            <DefaultValue>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdSpinLockTimeout</C_Name>\r
@@ -10466,122 +11162,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
     </DXE_DRIVERS>\r
-  </TianoImage>\r
-  <PcdBuildDeclarations>\r
-    <!-- <Filename>PcdInfo.xml</Filename> -->\r
-    <!--   you can also specify individual elements here, not just a file name. -->\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-      <Token>0x00000001</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-      <Token>0x00000002</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-      <Token>0x00000003</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdSpinLockTimeout</C_Name>\r
-      <Token>0x00000004</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>10000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0f</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x80000000</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
+  </FrameworkModules>\r
+  <PcdDynamicBuildDeclarations>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtMemorySize</C_Name>\r
+      <Token>0x00001005</Token>\r
+      <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10589,35 +11175,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>1</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x07</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0</MaxSku>\r
-      <SkuId>0</SkuId>\r
-      <DatumSize>1</DatumSize>\r
+      <DatumSize>10</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0xAF</DefaultValue>\r
+      <DefaultValue>L"64!64"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
-      <Token>0x00000009</Token>\r
-      <DatumType>UINT8</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtCpuModel</C_Name>\r
+      <Token>0x00001007</Token>\r
+      <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10625,14 +11193,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>1</DatumSize>\r
+      <DatumSize>48</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
+      <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+    <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
       <DatumType>VOID*</DatumType>\r
@@ -10650,7 +11218,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+    <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
       <DatumType>VOID*</DatumType>\r
@@ -10668,43 +11236,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtSerialPort</C_Name>\r
-      <Token>0x00001002</Token>\r
-      <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>20</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"COM1!COM2"</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtUga</C_Name>\r
-      <Token>0x00001003</Token>\r
-      <DatumType>VOID*</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>50</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+    <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
       <DatumType>VOID*</DatumType>\r
@@ -10722,9 +11254,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>\r
       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtMemorySize</C_Name>\r
-      <Token>0x00001005</Token>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtSerialPort</C_Name>\r
+      <Token>0x00001002</Token>\r
       <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
@@ -10733,34 +11265,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>10</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"64!64"</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtBootMode</C_Name>\r
-      <Token>0x00001006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>false</HiiEnable>\r
-      <VpdEnable>false</VpdEnable>\r
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
-      <SkuEnable>false</SkuEnable>\r
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
-      <MaxSku>0x00</MaxSku>\r
-      <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
+      <DatumSize>20</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1</DefaultValue>\r
+      <DefaultValue>L"COM1!COM2"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtCpuModel</C_Name>\r
-      <Token>0x00001007</Token>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtConsole</C_Name>\r
+      <Token>0x0000100a</Token>\r
       <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
@@ -10769,16 +11283,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>48</DatumSize>\r
+      <DatumSize>50</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
-      <Token>0x00001008</Token>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtUga</C_Name>\r
+      <Token>0x00001003</Token>\r
       <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
@@ -10787,17 +11300,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>8</DatumSize>\r
+      <DatumSize>50</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"3000"</DefaultValue>\r
+      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
-      <Token>0x00001009</Token>\r
-      <DatumType>VOID*</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdTestDynamicUint8</C_Name>\r
+      <Token>0x00011000</Token>\r
+      <DatumType>UINT8</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10805,17 +11317,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>44</DatumSize>\r
+      <DatumSize>1</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>\r
+      <DefaultValue>0x1</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtConsole</C_Name>\r
-      <Token>0x0000100a</Token>\r
-      <DatumType>VOID*</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdTestDynamicUint16</C_Name>\r
+      <Token>0x00011001</Token>\r
+      <DatumType>UINT16</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10823,18 +11335,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>50</DatumSize>\r
+      <DatumSize>2</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
+      <DefaultValue>0x1234</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdRothmanTest</C_Name>\r
-      <Token>0x0000100b</Token>\r
+      <C_Name>PcdTestDynamicUint32</C_Name>\r
+      <Token>0x00011002</Token>\r
       <DatumType>UINT32</DatumType>\r
-      <HiiEnable>true</HiiEnable>\r
+      <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
       <SkuEnable>false</SkuEnable>\r
@@ -10842,16 +11354,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
       <DatumSize>4</DatumSize>\r
-      <VariableGuid>0B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</VariableGuid>\r
-      <VariableName>L"RothmanVariable"</VariableName>\r
+      <VariableGuid>0</VariableGuid>\r
+      <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
+      <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
-      <Token>0x0001000b</Token>\r
-      <DatumType>UINT32</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdTestDynamicUint64</C_Name>\r
+      <Token>0x00011003</Token>\r
+      <DatumType>UINT64</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10859,17 +11371,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
+      <DatumSize>8</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1234</DefaultValue>\r
+      <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
-      <Token>0x0001000c</Token>\r
-      <DatumType>UINT32</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdTestDynamicBoolean</C_Name>\r
+      <Token>0x00011004</Token>\r
+      <DatumType>BOOLEAN</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10877,17 +11389,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>4</DatumSize>\r
+      <DatumSize>1</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x5678</DefaultValue>\r
+      <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FEATURE_FLAG">\r
-      <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
-      <Token>0x0001000d</Token>\r
-      <DatumType>BOOLEAN</DatumType>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
+      <Token>0x00001008</Token>\r
+      <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10895,12 +11407,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
       <MaxSku>0x00</MaxSku>\r
       <SkuId>0x00</SkuId>\r
-      <DatumSize>1</DatumSize>\r
+      <DatumSize>8</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1</DefaultValue>\r
+      <DefaultValue>L"3000"</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
@@ -10920,7 +11432,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>\r
       <DefaultValue>0x0</DefaultValue>\r
     </PcdBuildData>\r
-  </PcdBuildDeclarations>\r
+  </PcdDynamicBuildDeclarations>\r
   <BuildOptions>\r
     <OutputDirectory IntermediateDirectories="UNIFIED"/>\r
     <Option>CC_FLAGS="/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\""</Option>\r