Modify fpd file according to transition schema. Before PCD tools updated, all informa...
authorklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 1 Jun 2006 09:50:37 +0000 (09:50 +0000)
committerklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Thu, 1 Jun 2006 09:50:37 +0000 (09:50 +0000)
1) Add <FrameworkModules> element in FPD
2) Add all PCD entried for all modules in <FrameworkModules>

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

EdkModulePkg/EdkModulePkg.fpd
EdkNt32Pkg/Nt32.fpd
MdePkg/MdePkg.fpd

index 72fe519..8135746 100644 (file)
@@ -21,6 +21,74 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>\r
   </Flash>\r
   <TianoImage>\r
+    <SEC>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld"/>\r
+    </SEC>\r
+    <PEI_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld"/>\r
+    </PEI_CORE>\r
+    <PEIM>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld"/>\r
+    </PEIM>\r
+    <DXE_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld"/>\r
+    </DXE_CORE>\r
+    <DXE_DRIVERS>\r
+      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe"/>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld"/>\r
+    </DXE_DRIVERS>\r
+    <OTHER_COMPONENTS>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIpl" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="GraphicsConsole" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Runtime" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="MonotonicCounter" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Variable" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="EmuVariable" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="StatusCode" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PcdPeim" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="WatchDogTimer" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="FtwLite" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Terminal" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHub" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHubStdErr" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="NullMemoryTest" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiDatabase" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ConSplitter" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BC" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Dhcp4" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SNP" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Ebc" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SetupBrowser" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DriverSample" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PciBus" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="AtapiPassThru" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="IdeBus" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Uhci" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiBus" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiDisk" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBot" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBus" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi0" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi1" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbKb" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" />\r
+    </OTHER_COMPONENTS>\r
+  </TianoImage>\r
+  <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\r
         <PcdBuildDeclarations>\r
@@ -523,6 +591,162 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </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
+            <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>0x0f</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>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
+          <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>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
+        </PcdBuildDeclarations>\r
       </ModuleSA>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >\r
         <PcdBuildDeclarations>\r
@@ -645,6 +869,23 @@ 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
+            <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
         </PcdBuildDeclarations>\r
       </ModuleSA>      \r
     </DXE_DRIVERS>\r
@@ -3078,23 +3319,6 @@ 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
-            <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>0</MaxSku>\r
-            <SkuId>0</SkuId>\r
-            <DatumSize>4</DatumSize>\r
-            <VariableGuid>0</VariableGuid>\r
-            <VariableName>L""</VariableName>\r
-            <DataOffset>0</DataOffset>\r
-            <DefaultValue>0x08</DefaultValue>\r
-          </PcdBuildData>           \r
         </PcdBuildDeclarations>\r
       </ModuleSA>      \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" >\r
@@ -7455,7 +7679,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </PcdBuildDeclarations>\r
       </ModuleSA>      \r
     </OTHER_COMPONENTS>\r
-  </TianoImage>\r
+  </FrameworkModules>\r
   <PcdBuildDeclarations>\r
     <PcdBuildData ItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
index f8ca505..3c2c42f 100644 (file)
@@ -116,10 +116,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
@@ -238,7 +342,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 +410,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 +427,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
@@ -497,10 +619,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 +654,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
@@ -640,7 +794,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
@@ -778,9 +932,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
@@ -920,7 +1164,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
@@ -1060,7 +1304,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
@@ -1200,7 +1444,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
@@ -1340,7 +1584,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
@@ -1480,7 +1724,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
@@ -1620,12 +1864,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
@@ -1765,9 +2004,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
@@ -1907,11 +2144,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
@@ -2051,8 +2289,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
@@ -2191,7 +2449,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 +2487,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
@@ -2331,7 +2627,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
@@ -2471,7 +2767,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
@@ -2611,7 +2907,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
@@ -2751,7 +3047,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
@@ -2891,7 +3187,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
@@ -3031,7 +3327,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
@@ -3171,8 +3467,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
@@ -3311,7 +3625,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
@@ -3451,7 +3765,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
@@ -3591,7 +3905,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
@@ -3731,7 +4045,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
@@ -3871,7 +4185,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
@@ -4011,7 +4325,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
@@ -4151,7 +4465,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
@@ -4291,7 +4605,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
@@ -4431,7 +4745,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
@@ -4571,7 +4885,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
@@ -4711,7 +5025,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
@@ -4851,7 +5165,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
@@ -4991,7 +5305,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
@@ -5131,7 +5445,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
@@ -5271,7 +5585,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
@@ -5411,7 +5725,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
@@ -5551,7 +5865,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
@@ -5691,7 +6005,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
@@ -5831,7 +6145,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
@@ -5971,9 +6285,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
@@ -6113,7 +6425,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
@@ -6253,7 +6565,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
@@ -6393,7 +6705,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
@@ -6533,7 +6847,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
@@ -6673,7 +6987,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
@@ -6813,7 +7127,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
@@ -6953,7 +7267,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
@@ -7093,7 +7407,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
@@ -7233,8 +7547,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
@@ -7373,7 +7705,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
@@ -7513,7 +7845,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
@@ -7653,7 +7985,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
@@ -7793,7 +8125,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
@@ -7933,7 +8265,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
@@ -8073,7 +8405,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
@@ -8213,7 +8545,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
@@ -8353,7 +8685,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
@@ -8493,7 +8825,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
@@ -8633,7 +8965,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
@@ -8773,7 +9105,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
@@ -8913,7 +9245,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
@@ -9051,27 +9383,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 +9398,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 +9415,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 +9432,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>0x0f</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 +9449,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 +9466,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 +9483,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 +9500,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
@@ -9347,7 +9665,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
@@ -9485,14 +9803,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,16 +9814,248 @@ 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
+          <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
@@ -9627,7 +10173,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
@@ -9767,7 +10313,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
@@ -9907,7 +10453,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
@@ -10047,11 +10593,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
@@ -10191,45 +10733,329 @@ 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
-      <DatumSize>4</DatumSize>\r
-      <VariableGuid>0</VariableGuid>\r
-      <VariableName>L""</VariableName>\r
-      <DataOffset>0</DataOffset>\r
-      <GuidOffset>0</GuidOffset>\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>0x0f</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>0x0f</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
+      <DataOffset>0</DataOffset>\r
+      <GuidOffset>0</GuidOffset>\r
       <DefaultValue>1000000</DefaultValue>\r
     </PcdBuildData>\r
     <PcdBuildData ItemType="FIXED_AT_BUILD">\r
@@ -10351,17 +11177,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 +11447,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 +11465,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 +11483,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 +11501,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 +11519,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 +11537,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 +11555,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 +11578,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 +11591,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 +11609,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 +11629,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 +11647,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 +11665,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 +11683,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 +11701,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 +11719,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 +11737,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 +11754,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 +11850,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
index 3bbc9bf..477645d 100644 (file)
@@ -21,6 +21,89 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>\r
   </Flash>\r
   <TianoImage>\r
+    <SEC>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+    </SEC>\r
+    <PEI_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+    </PEI_CORE>\r
+    <PEIM>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+    </PEIM>\r
+    <DXE_CORE>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+    </DXE_CORE>\r
+    <DXE_DRIVERS>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+    </DXE_DRIVERS>\r
+\r
+    <OTHER_COMPONENTS>\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLibRepStr" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLibMmx" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLibSse2" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseCacheMaintenanceLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseIoLibIntrinsic" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseTimerLibLocalApic" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePeCoffLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePeCoffGetEntryPointLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciCf8Lib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiSmbusLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmbusLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLib" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeimEntryPoint" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeCoreEntryPoint" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeHobLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiHobLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeCoreHobLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeServicesTableLib" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIoLibCpuIo" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeSmmDriverEntryPoint" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiBootServicesTableLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiRuntimeServicesTableLib" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiMemoryLib" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiPcdLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMemoryAllocationLib" />\r
+\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMemoryAllocationLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseUefiDecompressLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDevicePathLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDevicePathLibDevicePathProtocol" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiLib" />\r
+      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiResourcePublicationLib" />\r
+    </OTHER_COMPONENTS>\r
+  </TianoImage>\r
+  <FrameworkModules>\r
     <SEC>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
         <PcdBuildDeclarations>\r
@@ -391,7 +474,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </PcdBuildDeclarations>\r
       </ModuleSA>        \r
     </DXE_DRIVERS>\r
-\r
     <OTHER_COMPONENTS>\r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >\r
         <PcdBuildDeclarations>\r
@@ -566,6 +648,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >\r
+        <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPciExpressBaseAddress</C_Name>\r
+            <Token>0x0000000A</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>0</MaxSku>\r
+            <SkuId>0</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0xE0000000</DefaultValue>\r
+          </PcdBuildData>\r
+        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >\r
       </ModuleSA>        \r
@@ -573,6 +675,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
 \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >\r
+        <PcdBuildDeclarations>\r
+          <PcdBuildData ItemType="FIXED_AT_BUILD">\r
+            <C_Name>PcdPciExpressBaseAddress</C_Name>\r
+            <Token>0x0000000A</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>0</MaxSku>\r
+            <SkuId>0</SkuId>\r
+            <DatumSize>4</DatumSize>\r
+            <VariableGuid>0</VariableGuid>\r
+            <VariableName>L""</VariableName>\r
+            <DataOffset>0</DataOffset>\r
+            <GuidOffset>0</GuidOffset>\r
+            <DefaultValue>0xE0000000</DefaultValue>\r
+          </PcdBuildData>        \r
+        </PcdBuildDeclarations>\r
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >\r
       </ModuleSA>        \r
@@ -878,8 +1000,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSA>        \r
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiResourcePublicationLib" >\r
       </ModuleSA>        \r
-    </OTHER_COMPONENTS>\r
-  </TianoImage>\r
+    </OTHER_COMPONENTS>  \r
+  </FrameworkModules>\r
   <PcdBuildDeclarations>\r
     <PcdBuildData ItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r