Updated Header information, added Guid, Version Specification, removed createdBy

[mirror_edk2.git] / EdkNt32Pkg / Nt32.fpd

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index f8ca505d3614bc563785c81058c2505304880c87..e0bd613132bddb380e52d0bf64eeb69a8ca1e375 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
 <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
@@ -497,10 +625,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </PEI_CORE>\r
     <PEIM>\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -536,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
@@ -551,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
@@ -640,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="BootMode">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -691,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
@@ -778,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="PeiFlashMap">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -831,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
@@ -920,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="PeiBaseMemoryTestInit">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -971,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
@@ -1060,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="PeiVariable">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1111,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
@@ -1200,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="WinNtAutoScan">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1251,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
@@ -1340,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="WinNtFwh">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1391,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
@@ -1480,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="WinNtStuff">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1531,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
@@ -1620,12 +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="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="WinNtFwh">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1676,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
@@ -1765,9 +2010,7 @@ 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="WinNtStuff">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -1818,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
@@ -1907,11 +2150,12 @@ 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="PcdDxe">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\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
@@ -1962,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
@@ -2051,8 +2295,28 @@ 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
+    </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
@@ -2102,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
@@ -2191,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="Metronome">\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
@@ -2227,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
@@ -2242,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
@@ -2331,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="Timer">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2382,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
@@ -2471,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="RealTimeClock">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2522,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
@@ -2611,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="Reset">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2662,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
@@ -2751,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="Bds">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2802,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
@@ -2891,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="WatchDogTimer">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -2942,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
@@ -3031,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="Runtime">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3082,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
@@ -3171,8 +3473,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="MonotonicCounter">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">\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
@@ -3222,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
@@ -3311,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="StatusCode">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3362,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
@@ -3451,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="FwBlockService">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3502,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
@@ -3591,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="FtwLite">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3642,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
@@ -3731,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="Variable">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3782,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
@@ -3871,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="SecurityStub">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -3922,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
@@ -4011,7 +4331,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="FtwLite">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4062,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
@@ -4151,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="DebugSupport">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4202,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
@@ -4291,7 +4611,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="FV_RECOVERY" ModuleName="SecurityStub">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4342,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
@@ -4431,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="ConSplitter">\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4482,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
@@ -4571,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="GraphicsConsole">\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4622,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
@@ -4711,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="Terminal">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4762,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
@@ -4851,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="DataHub">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -4902,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
@@ -4991,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="DataHubStdErr">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5042,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
@@ -5131,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="DiskIo">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5182,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
@@ -5271,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="DiskIoPartition">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5322,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
@@ -5411,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="Ebc">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5462,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
@@ -5551,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="NullMemoryTest">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5602,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
@@ -5691,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="HiiDatabase">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5742,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
@@ -5831,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="Partition">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -5882,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
@@ -5971,9 +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="Logo">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6024,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
@@ -6113,7 +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="SetupBrowser">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6164,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
@@ -6253,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="DriverSample">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6304,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
@@ -6393,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="English">\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
@@ -6444,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
@@ -6533,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="AtapiPassThru">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6584,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
@@ -6673,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="CirrusLogic5430UgaDraw">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6724,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
@@ -6813,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="IdeBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -6864,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
@@ -6953,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="Uhci">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7004,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
@@ -7093,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="ScsiBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7144,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
@@ -7233,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="ScsiDisk">\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
@@ -7284,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
@@ -7373,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="UsbBot">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7424,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
@@ -7513,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="UsbBus">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7564,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
@@ -7653,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="UsbCbi0">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7704,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
@@ -7793,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="UsbCbi1">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7844,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
@@ -7933,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="UsbKb">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -7984,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
@@ -8073,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="UsbMassStorage">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8124,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
@@ -8213,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="UsbMouse">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8264,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
@@ -8353,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="BC">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8404,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
@@ -8493,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="Dhcp4">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8544,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
@@ -8633,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="SNP">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8684,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
@@ -8773,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="WinNtThunk">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8824,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
@@ -8913,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="WinNtBusDriver">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -8964,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
@@ -9051,27 +9389,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="SNP">\r
+        <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\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
-            <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
-            <DefaultValue>L"64!64"</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>PcdMaximumUnicodeStringLength</C_Name>\r
+            <Token>0x00000001</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9079,16 +9404,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>PcdMaximumAsciiStringLength</C_Name>\r
+            <Token>0x00000002</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9096,16 +9421,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>PcdWinNtSerialPort</C_Name>\r
-            <Token>0x00001002</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
@@ -9113,17 +9438,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>0x1f</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtUga</C_Name>\r
-            <Token>0x00001003</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
@@ -9131,16 +9455,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>10000000</DefaultValue>\r
           </PcdBuildData>\r
-          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtCpuModel</C_Name>\r
-            <Token>0x00001007</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
@@ -9148,16 +9472,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>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+            <DefaultValue>0x80000000</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>PcdReportStatusCodePropertyMask</C_Name>\r
+            <Token>0x00000007</Token>\r
+            <DatumType>UINT8</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9165,16 +9489,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>120</DatumSize>\r
+            <DatumSize>1</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>0x07</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>PcdMaximumLinkedListLength</C_Name>\r
+            <Token>0x00000003</Token>\r
+            <DatumType>UINT32</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9182,32 +9506,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>48</DatumSize>\r
+            <DatumSize>4</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
+            <DefaultValue>1000000</DefaultValue>\r
           </PcdBuildData>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdWinNtConsole</C_Name>\r
-            <Token>0x0000100a</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>50</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"Bus Driver Console Window"</DefaultValue>\r
+            <DefaultValue>0xAF</DefaultValue>\r
           </PcdBuildData>\r
         </PcdBuildDeclarations>\r
       </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9258,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
@@ -9347,7 +9671,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="WinNtBusDriver">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9398,7 +9722,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
@@ -9485,14 +9809,10 @@ 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="WinNtSerialIo">\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>PcdWinNtMemorySize</C_Name>\r
+            <Token>0x00001005</Token>\r
+            <DatumType>VOID*</DatumType>\r
             <HiiEnable>false</HiiEnable>\r
             <VpdEnable>false</VpdEnable>\r
             <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -9500,18 +9820,250 @@ 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>10</DatumSize>\r
             <VariableGuid>0</VariableGuid>\r
             <VariableName>L""</VariableName>\r
             <DataOffset>0</DataOffset>\r
-            <DefaultValue>1000000</DefaultValue>\r
+            <DefaultValue>L"64!64"</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
+          <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
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>24</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+          </PcdBuildData>\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
+            <SkuEnable>false</SkuEnable>\r
+            <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+            <MaxSku>0x00</MaxSku>\r
+            <SkuId>0x00</SkuId>\r
+            <DatumSize>24</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+          </PcdBuildData>\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
@@ -9538,7 +10090,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
@@ -9627,7 +10179,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="WinNtConsole">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9678,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
@@ -9767,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="WinNtUga">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9818,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
@@ -9907,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="MiscSubclass">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -9958,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
@@ -10047,11 +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="Shell">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">\r
-      </ModuleSA>\r
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld">\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">\r
         <PcdBuildDeclarations>\r
           <PcdBuildData ItemType="FIXED_AT_BUILD">\r
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
@@ -10102,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
@@ -10191,40 +10739,324 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </PcdBuildData>\r
         </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
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">\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="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
+            <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
+    </DXE_DRIVERS>\r
+  </FrameworkModules>\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
@@ -10284,7 +11116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0f</DefaultValue>\r
+      <DefaultValue>0x1f</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
@@ -10351,17 +11183,269 @@ 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>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="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
+      <SkuEnable>false</SkuEnable>\r
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+      <MaxSku>0x00</MaxSku>\r
+      <SkuId>0x00</SkuId>\r
+      <DatumSize>24</DatumSize>\r
+      <VariableGuid>0</VariableGuid>\r
+      <VariableName>L""</VariableName>\r
+      <DataOffset>0</DataOffset>\r
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+    </PcdBuildData>\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
+      <SkuEnable>false</SkuEnable>\r
+      <SkuDataArrayEnable>false</SkuDataArrayEnable>\r
+      <MaxSku>0x00</MaxSku>\r
+      <SkuId>0x00</SkuId>\r
+      <DatumSize>24</DatumSize>\r
+      <VariableGuid>0</VariableGuid>\r
+      <VariableName>L""</VariableName>\r
+      <DataOffset>0</DataOffset>\r
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+    </PcdBuildData>\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
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L"UGA Window 1!UGA Window 2"</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
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
+    </PcdBuildData>\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
+      <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
+    <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
+    <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
+      <VariableGuid>0</VariableGuid>\r
+      <VariableName>L""</VariableName>\r
+      <DataOffset>0</DataOffset>\r
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>1</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
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L"Intel(R) Processor Model"</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="FIXED_AT_BUILD">\r
+      <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
+      <Token>0x00001009</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>44</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
+    </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
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
+    </PcdBuildData>\r
+    <PcdBuildData ItemType="DYNAMIC">\r
+      <C_Name>PcdRothmanTest</C_Name>\r
+      <Token>0x0000100b</Token>\r
+      <DatumType>UINT32</DatumType>\r
+      <HiiEnable>true</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>0B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</VariableGuid>\r
+      <VariableName>RothmanVariable</VariableName>\r
+      <DataOffset>0</DataOffset>\r
+      <GuidOffset>0</GuidOffset>\r
+      <DefaultValue>0</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>0</DefaultValue>\r
+      <DefaultValue>0x1234</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
-      <Token>0x00001000</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10369,17 +11453,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>24</DatumSize>\r
+      <DatumSize>4</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+      <DefaultValue>0x5678</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtVirtualDisk</C_Name>\r
-      <Token>0x00001001</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10387,17 +11471,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>24</DatumSize>\r
+      <DatumSize>1</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"FW;40960;512"</DefaultValue>\r
+      <DefaultValue>0x1</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtSerialPort</C_Name>\r
-      <Token>0x00001002</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10405,17 +11489,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>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>0x0</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtUga</C_Name>\r
-      <Token>0x00001003</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10423,17 +11507,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>50</DatumSize>\r
+      <DatumSize>4</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
+      <DefaultValue>0x8</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtFileSystem</C_Name>\r
-      <Token>0x00001004</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10441,17 +11525,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>120</DatumSize>\r
+      <DatumSize>4</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
+      <DefaultValue>0x0</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtMemorySize</C_Name>\r
-      <Token>0x00001005</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10459,17 +11543,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>10</DatumSize>\r
+      <DatumSize>1</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"64!64"</DefaultValue>\r
+      <DefaultValue>0x1</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
-      <Token>0x00001005</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
@@ -10477,16 +11561,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>2</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"64!64"</DefaultValue>\r
+      <DefaultValue>0x1234</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtBootMode</C_Name>\r
-      <Token>0x00001006</Token>\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
@@ -10500,12 +11584,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>1</DefaultValue>\r
+      <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtCpuModel</C_Name>\r
-      <Token>0x00001007</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10513,17 +11597,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>48</DatumSize>\r
+      <DatumSize>8</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>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtCpuSpeed</C_Name>\r
-      <Token>0x00001008</Token>\r
-      <DatumType>VOID*</DatumType>\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
@@ -10531,16 +11615,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>8</DatumSize>\r
+      <DatumSize>1</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>L"3000"</DefaultValue>\r
+      <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
-      <Token>0x00001009</Token>\r
+  </PcdBuildDeclarations>\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
@@ -10549,16 +11635,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>44</DatumSize>\r
+      <DatumSize>10</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>L"64!64"</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtConsole</C_Name>\r
-      <Token>0x0000100a</Token>\r
+      <C_Name>PcdWinNtCpuModel</C_Name>\r
+      <Token>0x00001007</Token>\r
       <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
@@ -10567,35 +11653,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>50</DatumSize>\r
+      <DatumSize>48</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>L"Intel(R) Processor Model"</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdRothmanTest</C_Name>\r
-      <Token>0x0000100b</Token>\r
-      <DatumType>UINT32</DatumType>\r
-      <HiiEnable>true</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>0B3ADA4F-AE56-4c24-8DEA-F03B7558AE50</VariableGuid>\r
-      <VariableName>RothmanVariable</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0</DefaultValue>\r
-    </PcdBuildData>\r
-    <PcdBuildData ItemType="PATCHABLE_IN_MODULE">\r
-      <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
-      <Token>0x0001000b</Token>\r
-      <DatumType>UINT32</DatumType>\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
@@ -10603,17 +11671,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>24</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1234</DefaultValue>\r
+      <DefaultValue>L"FW;40960;512"</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>PcdWinNtVirtualDisk</C_Name>\r
+      <Token>0x00001001</Token>\r
+      <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10621,17 +11689,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>24</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x5678</DefaultValue>\r
+      <DefaultValue>L"FW;40960;512"</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>PcdWinNtFileSystem</C_Name>\r
+      <Token>0x00001004</Token>\r
+      <DatumType>VOID*</DatumType>\r
       <HiiEnable>false</HiiEnable>\r
       <VpdEnable>false</VpdEnable>\r
       <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>\r
@@ -10639,17 +11707,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
+      <DatumSize>120</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x1</DefaultValue>\r
+      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
-      <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
-      <Token>0x0001000e</Token>\r
-      <DatumType>UINT32</DatumType>\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
@@ -10657,17 +11725,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>20</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
       <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0</DefaultValue>\r
+      <DefaultValue>L"COM1!COM2"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
-      <Token>0x0001000f</Token>\r
-      <DatumType>UINT32</DatumType>\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
@@ -10675,17 +11743,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>50</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x8</DefaultValue>\r
+      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
     </PcdBuildData>\r
-    <PcdBuildData ItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdVpdBaseAddress</C_Name>\r
-      <Token>0x00010010</Token>\r
-      <DatumType>UINT32</DatumType>\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
@@ -10693,12 +11760,11 @@ 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>50</DatumSize>\r
       <VariableGuid>0</VariableGuid>\r
       <VariableName>L""</VariableName>\r
       <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\r
-      <DefaultValue>0x0</DefaultValue>\r
+      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint8</C_Name>\r
@@ -10790,7 +11856,43 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidOffset>0</GuidOffset>\r
       <DefaultValue>NoDefault</DefaultValue>\r
     </PcdBuildData>\r
-  </PcdBuildDeclarations>\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="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
+  </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