Change NT32 to new XML Schema.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@678 6f19259b-4bc3-4df7-8a09-765794883524
author: wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> 2006-06-30 17:51:10 +0000
committer: wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> 2006-06-30 17:51:10 +0000
commit: 2d52720093851dcc3f0ffd30ac9854cc775300a9 (patch)
tree: ab59c88c5d16c91459c80881474c037f92f6d238 /EdkNt32Pkg
parent: 5d558ad8cf04e3109ea214850a777c60179e0646 (diff)
download: edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.zip
edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.tar.gz
edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.tar.bz2
32 files changed, 8870 insertions, 7041 deletions
diff --git a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
index 2344c17..1a0fe78 100644
--- a/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
+++ b/EdkNt32Pkg/Dxe/ConPlatform/ConPlatform.msa
@@ -1,116 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>ConPlatform</BaseName>
+    <ModuleName>ConPlatform</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>51ccf399-4fdf-4e55-a45b-e123f84d456a</Guid>
-    <Version>0</Version>
+    <GuidValue>51ccf399-4fdf-4e55-a45b-e123f84d456a</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for DiskIo module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:06</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>ConPlatform</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiRuntimeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>ConPlatform.c</Filename>
     <Filename>ConPlatform.h</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">SimpleTextOut</Protocol>
-    <Protocol Usage="TO_START">SimpleTextIn</Protocol>
-    <Protocol Usage="TO_START">DevicePath</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>SimpleTextOut</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>SimpleTextIn</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Variables>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ConInDev</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
+      <GuidC_Name>gConInDevGuid</GuidC_Name>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ConIn</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName>
+      <GuidC_Name>gConInGuid</GuidC_Name>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ConOutDev</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
+      <GuidC_Name>gConOutDevGuid</GuidC_Name>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ConOut</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>
+      <GuidC_Name>gConOutGuid</GuidC_Name>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ErrOutDev</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
+      <GuidC_Name>gErrOutDevGuid</GuidC_Name>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
-      <String>ErrOut</String>
-      <Guid>0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C</Guid>
+      <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>
+      <GuidC_Name>gErrOutGuid</GuidC_Name>
     </Variable>
   </Variables>
   <Guids>
-    <GuidEntry Usage="SOMETIMES_PRODUCED">
-      <C_Name>ConsoleInDevice</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_PRODUCED">
-      <C_Name>ConsoleOutDevice</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_PRODUCED">
-      <C_Name>StandardErrorDevice</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>HotPlugDevice</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>GlobalVariable</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="SOMETIMES_PRODUCED">
+      <GuidCName>ConsoleInDevice</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_PRODUCED">
+      <GuidCName>ConsoleOutDevice</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_PRODUCED">
+      <GuidCName>StandardErrorDevice</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>HotPlugDevice</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>GlobalVariable</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gConPlatformTextInDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gConPlatformTextInDriverBinding</DriverBinding>
       <ComponentName>gConPlatformComponentName</ComponentName>
     </Extern>
     <Extern>
       <DriverBinding>gConPlatformTextOutDriverBinding</DriverBinding>
+    </Extern>
+    <Extern>
       <ComponentName>gConPlatformComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
index 3c47d82..5f5d016 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa
@@ -1,46 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>MiscSubclass</BaseName>
+    <ModuleName>MiscSubclass</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</Guid>
-    <Version>0</Version>
+    <GuidValue>4A9B9DB8-EC62-4A92-818F-8AA0246D246E</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for MiscSubclass Driver module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:07</Created>
-    <Updated>2006-03-23 13:50</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>MiscSubclass</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HiiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>MiscSubclassDriver.uni</Filename>
@@ -64,51 +80,85 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>MiscPortInternalConnectorDesignatorFunction.c</Filename>
     <Filename>MiscSubclassDriver.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">DataHub</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>
-    <ProtocolNotify Usage="SOMETIMES_CONSUMED">WinNtIo</ProtocolNotify>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>DataHub</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>Hii</ProtocolCName>
+    </Protocol>
+    <ProtocolNotify Usage="SOMETIMES_CONSUMED">
+      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+    </ProtocolNotify>
   </Protocols>
   <DataHubs>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortKeyboard</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortMouse</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortCom1</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscPortCom2</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscBiosVendor</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscSystemManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscBaseBoardManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscChassisManufacturer</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">MiscSystemSlotDesignation</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">OemString</DataHubRecord>
-    <DataHubRecord Usage="ALWAYS_PRODUCED">SystemOptionString</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">ProcessorSubClassData</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">MemorySubClassData</DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortKeyboard</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortMouse</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortCom1</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscPortCom2</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscBiosVendor</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscSystemManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscBaseBoardManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscChassisManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>MiscSystemSlotDesignation</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>OemString</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="ALWAYS_PRODUCED">
+      <DataHubCName>SystemOptionString</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>ProcessorSubClassData</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">
+      <DataHubCName>MemorySubClassData</DataHubCName>
+    </DataHubRecord>
   </DataHubs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>MiscSubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>ProcessorSubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>MemoryProducer</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>MemorySubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>WinNtMemory</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>MiscSubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>ProcessorSubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>MemoryProducer</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>MemorySubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>WinNtMemory</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>MiscSubclassDriverEntryPoint</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 0ee2dfc..af5feb9 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -1,56 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Bds</BaseName>
+    <ModuleName>Bds</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>A6F691AC-31C8-4444-854C-E2C1A6950F92</Guid>
-    <Version>0</Version>
+    <GuidValue>A6F691AC-31C8-4444-854C-E2C1A6950F92</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for DxeIpl module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:04</Created>
-    <Updated>2006-03-23 14:14</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Bds</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkGraphicsLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DxeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkIfrSupportLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkGenericBdsLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PcdLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>EdkGraphicsLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DxeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PerformanceLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PrintLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>EdkIfrSupportLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>ReportStatusCodeLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>EdkGenericBdsLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiRuntimeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HiiLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>PlatformData.c</Filename>
@@ -78,74 +114,118 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Generic\BootMaint\FE.vfr</Filename>
     <Filename>Generic\BootMngr\BootManager.c</Filename>
     <Filename>Generic\BootMngr\BootManagerStrings.uni</Filename>
-    <Filename>Generic\BootMngr\BootManagerVfr.Vfr</Filename>
+    <Filename>Generic\BootMngr\BootManagerVfr.vfr</Filename>
     <Filename>Generic\DeviceMngr\DeviceManager.c</Filename>
     <Filename>Generic\DeviceMngr\DeviceManagerStrings.uni</Filename>
-    <Filename>Generic\DeviceMngr\DeviceManagerVfr.Vfr</Filename>
+    <Filename>Generic\DeviceMngr\DeviceManagerVfr.vfr</Filename>
     <Filename>Generic\Bds.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">Bds</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">LegacyBios</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">UgaSplash</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">Hii</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">FormCallback</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">DataHub</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">FormBrowser</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">ConsoleControl</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">CpuIo</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">UgaDraw</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">LoadFile</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">SimpleFileSystem</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">DevicePath</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">BlockIo</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">SerialIo</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">GenericMemTest</Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">Cpu</Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">DriverBinding</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>Bds</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>LegacyBios</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>UgaSplash</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>Hii</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>FormCallback</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>DataHub</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>FormBrowser</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>ConsoleControl</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>CpuIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>UgaDraw</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>LoadFile</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>BlockIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>SerialIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>GenericMemTest</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_CONSUMED">
+      <ProtocolCName>Cpu</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_CONSUMED">
+      <ProtocolCName>DriverBinding</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Hobs>
-    <Hob Usage="SOMETIMES_CONSUMED" HobType="GUID_EXTENSION">
-      <Name>FlashMapEntryData</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_CONSUMED" HobType="CAPSULE_VOLUME"></Hob>
-  </Hobs>
   <DataHubs>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">BiosVendor</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">SystemManufacturer</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">ProcessorVersion</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">ProcessorFrequency</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">MemoryArray</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">SerialIoDevice</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_CONSUMED">SerialIoPort</DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>BiosVendor</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>SystemManufacturer</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>ProcessorVersion</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>ProcessorFrequency</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>MemoryArray</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>SerialIoDevice</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>SerialIoPort</DataHubCName>
+    </DataHubRecord>
   </DataHubs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>BootState</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>GlobalVariable</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>FlashMapHob</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>FileSystemVolumeLabelInfoId</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>FileInfo</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>BootState</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>GlobalVariable</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>FlashMapHob</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>FileSystemVolumeLabelInfoId</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>FileInfo</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>BdsInitialize</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
index 8ff369c..4c67a60 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtBlockIo</BaseName>
+    <ModuleName>WinNtBlockIo</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>F479E147-A125-11d4-BCFC-0080C73C8881</Guid>
-    <Version>0</Version>
+    <GuidValue>F479E147-A125-11d4-BCFC-0080C73C8881</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtBlockIo module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtBlockIo</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtBlockIo.h</Filename>
@@ -48,31 +62,38 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DriverConfiguration.c</Filename>
     <Filename>DriverDiagnostics.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">WinNtIo</Protocol>
-    <Protocol Usage="BY_START">BlockIo</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>BlockIo</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtVirtualDisks</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>WinNtPhysicalDisks</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtVirtualDisks</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>WinNtPhysicalDisks</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtBlockIoDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtBlockIoDriverBinding</DriverBinding>
       <ComponentName>gWinNtBlockIoComponentName</ComponentName>
+    </Extern>
+    <Extern>
       <DriverDiag>gWinNtBlockIoDriverDiagnostics</DriverDiag>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
index 00fb469..6dc6525 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtConsole</BaseName>
+    <ModuleName>WinNtConsole</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>263631d7-5836-4b74-be48-ee22e92ce5d3</Guid>
-    <Version>0</Version>
+    <GuidValue>263631d7-5836-4b74-be48-ee22e92ce5d3</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtConsole module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtConsole</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Console.h</Filename>
@@ -48,28 +62,35 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>ConsoleOut.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">WinNtIo</Protocol>
-    <Protocol Usage="BY_START">SimpleTextOut</Protocol>
-    <Protocol Usage="BY_START">SimpleTextIn</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>SimpleTextOut</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>SimpleTextIn</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtConsole</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtConsole</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtConsoleDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtConsoleDriverBinding</DriverBinding>
       <ComponentName>gWinNtConsoleComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
index fb39a80..5784384 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
@@ -1,74 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtSerialIo</BaseName>
+    <ModuleName>WinNtSerialIo</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>6B41B553-A649-11d4-BD02-0080C73C8881</Guid>
-    <Version>0</Version>
+    <GuidValue>6B41B553-A649-11d4-BD02-0080C73C8881</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtSerialIo module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:02</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtSerialIo</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtSerialIo.h</Filename>
     <Filename>WinNtSerialIo.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">WinNtIo</Protocol>
-    <Protocol Usage="TO_START">DevicePath</Protocol>
-    <Protocol Usage="BY_START">SerialIo</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>SerialIo</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtSerialPort</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtSerialPort</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtSerialIoDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtSerialIoDriverBinding</DriverBinding>
       <ComponentName>gWinNtSerialIoComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
index d737d65..cfb4bc0 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
@@ -1,81 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtSimpleFileSystem</BaseName>
+    <ModuleName>WinNtSimpleFileSystem</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>9C25E18B-76BA-43da-A132-DBB0997CEFEF</Guid>
-    <Version>0</Version>
+    <GuidValue>9C25E18B-76BA-43da-A132-DBB0997CEFEF</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtSimpleFileSystem module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtSimpleFileSystem</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtSimpleFileSystem.h</Filename>
     <Filename>WinNtSimpleFileSystem.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">WinNtIo</Protocol>
-    <Protocol Usage="BY_START">SimpleFileSystem</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>SimpleFileSystem</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtFileSystem</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>FileSystemInfo</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>FileInfo</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>FileSystemVolumeLabelInfoId</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtFileSystem</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>FileSystemInfo</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>FileInfo</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>FileSystemVolumeLabelInfoId</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtSimpleFileSystemDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtSimpleFileSystemDriverBinding</DriverBinding>
       <ComponentName>gWinNtSimpleFileSystemComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
index f1eae5d..4f874ab 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtUga</BaseName>
+    <ModuleName>WinNtUga</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</Guid>
-    <Version>0</Version>
+    <GuidValue>AB248E8D-ABE1-11d4-BD0D-0080C73C8881</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for UGA module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtUga</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtUga.h</Filename>
@@ -48,36 +62,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>WinNtUgaScreen.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="TO_START">WinNtIo</Protocol>
-    <Protocol Usage="BY_START">UgaDraw</Protocol>
-    <Protocol Usage="BY_START">SimpleTextIn</Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>UgaDraw</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>SimpleTextIn</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Events>
     <CreateEvents>
-      <Event Usage="SOMETIMES_CONSUMED" EventGroup="EVENT_GROUP_EXIT_BOOT_SERVICES">
-        <C_Name>gEfiEventExitBootServicesGuid</C_Name>
-        <Guid>0x27abf055, 0xb1b8, 0x4c26, 0x80, 0x48, 0x74, 0x8f, 0x37, 0xba, 0xa2, 0xdf</Guid>
-      </Event>
+      <EventTypes EventGuidCName="gEfiEventExitBootServicesGuid" Usage="SOMETIMES_CONSUMED">
+        <EventType>EVENT_GROUP_GUID</EventType>
+      </EventTypes>
     </CreateEvents>
   </Events>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtUga</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtUga</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtUgaDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtUgaDriverBinding</DriverBinding>
       <ComponentName>gWinNtUgaComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 0d17e11..5078622 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -1,141 +1,194 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtBusDriver</BaseName>
+    <ModuleName>WinNtBusDriver</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</Guid>
-    <Version>0</Version>
+    <GuidValue>BD7E9A27-D6C5-416a-B245-5F507D95B2BD</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtBusDriver module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:02</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtBusDriver</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverModelLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PcdLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtBusDriver.h</Filename>
     <Filename>WinNtBusDriver.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="BY_START">WinNtIo</Protocol>
-    <Protocol Usage="TO_START">WinNtThunk</Protocol>
-    <Protocol Usage="TO_START">DevicePath</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">PcdProtocol</Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>WinNtIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>WinNtThunk</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>PcdProtocol</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtVirtualDisks</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtPhysicalDisks</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtFileSystem</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtSerialPort</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtUga</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtConsole</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtMemory</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtCPUModel</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>WinNtCPUSpeed</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtVirtualDisks</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtPhysicalDisks</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtFileSystem</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtSerialPort</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtUga</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtConsole</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtMemory</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtCPUModel</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>WinNtCPUSpeed</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>
     <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
+      <DriverBinding>gWinNtBusDriverBinding</DriverBinding>
     </Extern>
     <Extern>
-      <DriverBinding>gWinNtBusDriverBinding</DriverBinding>
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>
     </Extern>
   </Externs>
   <PcdCoded>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtConsole</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtConsole</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtUga</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtUga</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtSerialPort</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtSerialPort</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtFileSystem</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFileSystem</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtVirtualDisk</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtVirtualDisk</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtPhysicalDisk</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuModel</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtCpuModel</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuSpeed</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtCpuSpeed</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtMemorySize</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtMemorySize</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdWinNtBinaryPatch1</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch1</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdWinNtBinaryPatch2</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch2</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FEATURE_FLAG">
       <C_Name>PcdWinNtFeatureFlag1</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFeatureFlag1</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtDynamicUINT32</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
   </PcdCoded>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
index abaeca9..5e474ed 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Metronome</BaseName>
+    <ModuleName>Metronome</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>154CAB4A-52B5-46CD-99C3-4368ABBACFFD</Guid>
-    <Version>0</Version>
+    <GuidValue>154CAB4A-52B5-46CD-99C3-4368ABBACFFD</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for Metronome module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Metronome</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Metronome.c</Filename>
     <Filename>Metronome.h</Filename>
     <Filename>Metronome.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">Metronome</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>Metronome</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>WinNtMetronomeDriverInitialize</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
index 5522fb4..5678e41 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa
@@ -1,60 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>RealTimeClock</BaseName>
+    <ModuleName>RealTimeClock</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>27F05AF5-1644-4EF4-8944-48C4F75675A0</Guid>
-    <Version>0</Version>
+    <GuidValue>27F05AF5-1644-4EF4-8944-48C4F75675A0</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for RealTimeClock module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>RealTimeClock</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>RealTimeClock.c</Filename>
     <Filename>RealTimeClock.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">RealTimeClock</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>RealTimeClock</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeRealTimeClock</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
index 440d2b0..a1e7c64 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa
@@ -1,60 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Reset</BaseName>
+    <ModuleName>Reset</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</Guid>
-    <Version>0</Version>
+    <GuidValue>BA929954-35B0-4dd3-90CD-9634BD7E1CF1</GuidValue>
+    <Version>1.0</Version>
     <Abstract>description of file contents</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Reset</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Reset.c</Filename>
     <Filename>Reset.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">Reset</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>Reset</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeNtReset</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
index c4e2325..53f7adc 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa
@@ -1,62 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Timer</BaseName>
+    <ModuleName>Timer</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>C3811036-710B-4E39-8CF1-0AF9BE3A8198</Guid>
-    <Version>0</Version>
+    <GuidValue>C3811036-710B-4E39-8CF1-0AF9BE3A8198</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for Timer module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Timer</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Timer.h</Filename>
     <Filename>Timer.c</Filename>
     <Filename>Timer.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">Timer</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">Cpu</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>Timer</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>Cpu</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>WinNtTimerDriverInitialize</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
index ce20d91..b7d252f 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Cpu</BaseName>
+    <ModuleName>Cpu</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>ee993080-5197-4d4e-b63c-f1f7413e33ce</Guid>
-    <Version>0</Version>
+    <GuidValue>ee993080-5197-4d4e-b63c-f1f7413e33ce</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for Cpu module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-23 16:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Cpu</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HiiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HiiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Strings.uni</Filename>
@@ -48,39 +62,55 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>CpuIo.c</Filename>
     <Filename>Cpu.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">Cpu</Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">CpuIo</Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">Hii</Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">DataHub</Protocol>
-    <ProtocolNotify Usage="SOMETIMES_CONSUMED">WinNtIo</ProtocolNotify>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>Cpu</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>CpuIo</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_CONSUMED">
+      <ProtocolCName>Hii</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_CONSUMED">
+      <ProtocolCName>DataHub</ProtocolCName>
+    </Protocol>
+    <ProtocolNotify Usage="SOMETIMES_CONSUMED">
+      <ProtocolNotifyCName>WinNtIo</ProtocolNotifyCName>
+    </ProtocolNotify>
   </Protocols>
   <DataHubs>
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">ProcessorVersion</DataHubRecord>
-    <DataHubRecord Usage="SOMETIMES_PRODUCED">ProcessorCoreFrequency</DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">
+      <DataHubCName>ProcessorVersion</DataHubCName>
+    </DataHubRecord>
+    <DataHubRecord Usage="SOMETIMES_PRODUCED">
+      <DataHubCName>ProcessorCoreFrequency</DataHubCName>
+    </DataHubRecord>
   </DataHubs>
   <Guids>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>ProcessorProducer</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>ProcessorSubClass</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>WinNtCPUModel</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>WinNtCPUSpeed</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>ProcessorProducer</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>ProcessorSubClass</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>WinNtCPUModel</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>WinNtCPUSpeed</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeCpu</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
index 47b6423..7ebebdc 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtThunk</BaseName>
+    <ModuleName>WinNtThunk</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>BS_DRIVER</ComponentType>
-    <Guid>0C95A916-A006-11d4-BCFA-0080C73C8881</Guid>
-    <Version>0</Version>
+    <GuidValue>0C95A916-A006-11d4-BCFA-0080C73C8881</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtThunk module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtThunk</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtThunk.h</Filename>
     <Filename>WinNtThunk.c</Filename>
     <Filename>WinNtThunk.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_PRODUCED">WinNtThunk</Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">DevicePath</Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>WinNtThunk</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeWinNtThunk</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 3ec3a12..bdf264d 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,213 +1,172 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<PackageSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <SpdHeader>
     <PackageName>EdkNt32Pkg</PackageName>
-    <Guid>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</Guid>
+    <GuidValue>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</GuidValue>
     <Version>0.3</Version>
     <Abstract>This is the NT32 Emulation Environment Platform</Abstract>
     <Description>Reference platform implementation using an emulator.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
-    <License>
-      All rights reserved.
-      This program and the accompanying materials are licensed and made available 
-      under the terms and conditions of the BSD License which accompanies this distribution.
-      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
-      OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
+    <License>All rights reserved.
+      This program and the accompanying materials are licensed and made available 
+      under the terms and conditions of the BSD License which accompanies this distribution.
+      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+      OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </SpdHeader>
+  <PackageDefinitions>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
-  </SpdHeader>
+  </PackageDefinitions>
   <LibraryClassDeclarations>
-    <LibraryClassDeclaration>
-      <LibraryClass>EdkGenericBdsLib</LibraryClass>
+    <LibraryClass Name="EdkGenericBdsLib">
       <IncludeHeader>Include/Library/EdkGenericBdsLib.h</IncludeHeader>
-    </LibraryClassDeclaration>
-    <LibraryClassDeclaration>
-      <LibraryClass>WinNtLib</LibraryClass>
+      <HelpText/>
+    </LibraryClass>
+    <LibraryClass Name="WinNtLib">
       <IncludeHeader>Include/Library/WinNtLib.h</IncludeHeader>
-    </LibraryClassDeclaration>
+      <HelpText/>
+    </LibraryClass>
   </LibraryClassDeclarations>
   <MsaFiles>
-  <!--
-    <MsaFile>
-      <Filename>Build/AprioriList.msa</Filename>
-    </MsaFile>
-    -->
-    <MsaFile>
-      <Filename>Dxe/ConPlatform/ConPlatform.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/PlatformBds/PlatformBds.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Chipset/Reset/Reset.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Chipset/Timer/Timer.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/Cpu/Cpu.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Library/DxeWinNtLib/DxeWinNtLib.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Library/EdkGenericBdsLib/EdkGenericBdsLib.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Logo/Logo.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/Autoscan/WinNtAutoScan.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/BootMode/BootMode.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/FirmwareVolume/WinNtFwh.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/FlashMap/FlashMap.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/MonoStatusCode/MonoStatusCode.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Pei/WinNtStuff/WinNtStuff.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>RuntimeDxe/FvbServices/Nt32Fwh.msa</Filename>
-    </MsaFile>
-    <MsaFile>
-      <Filename>Sec/SecMain.msa</Filename>
-    </MsaFile>
+    <!--<MsaFile>
+      <Filename>Build/AprioriList.msa</Filename>
+    </MsaFile>-->
+    <Filename>Dxe/ConPlatform/ConPlatform.msa</Filename>
+    <Filename>Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa</Filename>
+    <Filename>Dxe/PlatformBds/PlatformBds.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Chipset/Reset/Reset.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Chipset/Timer/Timer.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Cpu/Cpu.msa</Filename>
+    <Filename>Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa</Filename>
+    <Filename>Library/DxeWinNtLib/DxeWinNtLib.msa</Filename>
+    <Filename>Library/EdkGenericBdsLib/EdkGenericBdsLib.msa</Filename>
+    <Filename>Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa</Filename>
+    <Filename>Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa</Filename>
+    <Filename>Logo/Logo.msa</Filename>
+    <Filename>Pei/Autoscan/WinNtAutoScan.msa</Filename>
+    <Filename>Pei/BootMode/BootMode.msa</Filename>
+    <Filename>Pei/FirmwareVolume/WinNtFwh.msa</Filename>
+    <Filename>Pei/FlashMap/FlashMap.msa</Filename>
+    <Filename>Pei/MonoStatusCode/MonoStatusCode.msa</Filename>
+    <Filename>Pei/WinNtStuff/WinNtStuff.msa</Filename>
+    <Filename>RuntimeDxe/FvbServices/Nt32Fwh.msa</Filename>
+    <Filename>Sec/SecMain.msa</Filename>
   </MsaFiles>
   <PackageHeaders>
-    <IncludeHeader ModuleType="SEC">Include/WinNtPeim.h</IncludeHeader>
-    <IncludeHeader ModuleType="PEIM">Include/WinNtPeim.h</IncludeHeader>
-    <IncludeHeader ModuleType="DXE_DRIVER">Include/WinNtDxe.h</IncludeHeader>
-    <IncludeHeader ModuleType="DXE_RUNTIME_DRIVER">Include/WinNtDxe.h</IncludeHeader>
-    <IncludeHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludeHeader>
-    <IncludeHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludeHeader>
-    <IncludeHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludeHeader>
+    <IncludePkgHeader ModuleType="SEC">Include/WinNtPeim.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="PEIM">Include/WinNtPeim.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="DXE_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
+    <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
     <Entry Name="WinNtVirtualDisks">
       <C_Name>gEfiWinNtVirtualDisksGuid</C_Name>
-      <Guid>0xc95a928, 0xa006, 0x11d4, 0xbc, 0xfa, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>0C95A928-A006-11D4-BCFA-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtPhysicalDisks">
       <C_Name>gEfiWinNtPhysicalDisksGuid</C_Name>
-      <Guid>0xc95a92f, 0xa006, 0x11d4, 0xbc, 0xfa, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>0C95A92F-A006-11D4-BCFA-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtFileSystem">
       <C_Name>gEfiWinNtFileSystemGuid</C_Name>
-      <Guid>0xc95a935, 0xa006, 0x11d4, 0xbc, 0xfa, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>0C95A935-A006-11D4-BCFA-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtSerialPort">
       <C_Name>gEfiWinNtSerialPortGuid</C_Name>
-      <Guid>0xc95a93d, 0xa006, 0x11d4, 0xbc, 0xfa, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>0C95A93D-A006-11D4-BCFA-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtUga">
       <C_Name>gEfiWinNtUgaGuid</C_Name>
-      <Guid>0xab248e99, 0xabe1, 0x11d4, 0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>AB248E99-ABE1-11D4-BD0D-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtConsole">
       <C_Name>gEfiWinNtConsoleGuid</C_Name>
-      <Guid>0xba73672c, 0xa5d3, 0x11d4, 0xbd, 0x00, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>BA73672C-A5D3-11D4-BD00-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtMemory">
       <C_Name>gEfiWinNtMemoryGuid</C_Name>
-      <Guid>0x99042912, 0x122a, 0x11d4, 0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>99042912-122A-11D4-BD0D-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtCPUModel">
       <C_Name>gEfiWinNtCPUModelGuid</C_Name>
-      <Guid>0xbee9b6ce, 0x2f8a, 0x11d4, 0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>BEE9B6CE-2F8A-11D4-BD0D-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtCPUSpeed">
       <C_Name>gEfiWinNtCPUSpeedGuid</C_Name>
-      <Guid>0xd4f29055, 0xe1fb, 0x11d4, 0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>D4F29055-E1FB-11D4-BD0D-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNPassThrough">
       <C_Name>gEfiWinNtPassThroughGuid</C_Name>
-      <Guid>0xcc664eb8, 0x3c24, 0x4086, 0xb6, 0xf6, 0x34, 0xe8, 0x56, 0xbc, 0xe3, 0x6e</Guid>
+      <GuidValue>CC664EB8-3C24-4086-B6F6-34E856BCE36E</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="PcdHob">
       <C_Name>gPcdHobGuid</C_Name>
-      <Guid>0x582e7ca1, 0x68cd, 0x4d44, 0xb4, 0x3b, 0xf2, 0x98, 0xed, 0x58, 0x7b, 0xa6</Guid>
+      <GuidValue>582E7CA1-68CD-4D44-B43B-F298ED587BA6</GuidValue>
+      <HelpText/>
     </Entry>
   </GuidDeclarations>
   <ProtocolDeclarations>
     <Entry Name="WinNtIo">
       <C_Name>gEfiWinNtIoProtocolGuid</C_Name>
-      <Guid>0x96eb4ad6, 0xa32a, 0x11d4, 0xbc, 0xfd, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>96EB4AD6-A32A-11D4-BCFD-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="WinNtThunk">
       <C_Name>gEfiWinNtThunkProtocolGuid</C_Name>
-      <Guid>0x58c518b1, 0x76f3, 0x11d4, 0xbc, 0xea, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
+      <GuidValue>58C518B1-76F3-11D4-BCEA-0080C73C8881</GuidValue>
+      <HelpText/>
     </Entry>
   </ProtocolDeclarations>
   <PpiDeclarations>
     <Entry Name="NtAutoScan">
       <C_Name>gPeiNtAutoScanPpiGuid</C_Name>
-      <Guid>0xdce384d, 0x7c, 0x4ba5, 0x94, 0xbd, 0x0f, 0x6e, 0xb6, 0x4d, 0x2a, 0xa9</Guid>
+      <GuidValue>0DCE384D-007C-4BA5-94BD-0F6EB64D2AA9</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="NtFwh">
       <C_Name>gNtFwhPpiGuid</C_Name>
-      <Guid>0x4e76928f, 0x50ad, 0x4334, 0xb0, 0x6b, 0xa8, 0x42, 0x13, 0x10, 0x8a, 0x57</Guid>
+      <GuidValue>4E76928F-50AD-4334-B06B-A84213108A57</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="NtPeiLoadFile">
       <C_Name>gNtPeiLoadFilePpiGuid</C_Name>
-      <Guid>0xfd0c65eb, 0x405, 0x4cd2, 0x8a, 0xee, 0xf4, 0x00, 0xef, 0x13, 0xba, 0xc2</Guid>
+      <GuidValue>FD0C65EB-0405-4CD2-8AEE-F400EF13BAC2</GuidValue>
+      <HelpText/>
     </Entry>
     <Entry Name="NtThunk">
       <C_Name>gPeiNtThunkPpiGuid</C_Name>
-      <Guid>0x98c281e5, 0xf906, 0x43dd, 0xa9, 0x2b, 0xb0, 0x03, 0xbf, 0x27, 0x65, 0xda</Guid>
+      <GuidValue>98C281E5-F906-43DD-A92B-B003BF2765DA</GuidValue>
+      <HelpText/>
     </Entry>
   </PpiDeclarations>
   <PcdDeclarations>
     <PcdEntry>
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>
       <Token>0x00000001</Token>
-      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdMaximumUnicodeStringLength</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -216,7 +175,7 @@
     <PcdEntry>
       <C_Name>PcdMaximumAsciiStringLength</C_Name>
       <Token>0x00000002</Token>
-      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdMaximumAsciiStringLength</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -225,7 +184,7 @@
     <PcdEntry>
       <C_Name>PcdMaximumLinkedListLength</C_Name>
       <Token>0x00000003</Token>
-      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdMaximumLinkedListLength</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
@@ -234,7 +193,7 @@
     <PcdEntry>
       <C_Name>PcdSpinLockTimeout</C_Name>
       <Token>0x00000004</Token>
-      <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdSpinLockTimeout</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>10000000</DefaultValue>
@@ -243,7 +202,7 @@
     <PcdEntry>
       <C_Name>PcdDebugPropertyMask</C_Name>
       <Token>0x00000005</Token>
-      <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdDebugPropertyMask</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0f</DefaultValue>
@@ -252,7 +211,7 @@
     <PcdEntry>
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
       <Token>0x00000006</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdDebugPrintErrorLevel</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>
       <DefaultValue>0x80000000</DefaultValue>
@@ -261,7 +220,7 @@
     <PcdEntry>
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>
       <Token>0x00000007</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdReportStatusCodePropertyMask</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x07</DefaultValue>
@@ -270,7 +229,7 @@
     <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
@@ -279,16 +238,16 @@
     <PcdEntry>
       <C_Name>PcdDebugClearMemoryValue</C_Name>
       <Token>0x00000008</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
       <HelpText>HELP FIX ME!</HelpText>
-    </PcdEntry>    
+    </PcdEntry>
     <PcdEntry>
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
       <Token>0x00000009</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdPerformanceLibraryPropertyMask</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
@@ -297,7 +256,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <Token>0x00001000</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtPhysicalDisk</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
@@ -306,7 +265,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <Token>0x00001001</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtVirtualDisk</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
@@ -315,7 +274,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtSerialPort</C_Name>
       <Token>0x00001002</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtSerialPort</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"COM1!COM2"</DefaultValue>
@@ -324,7 +283,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtUga</C_Name>
       <Token>0x00001003</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtUga</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
@@ -333,7 +292,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtFileSystem</C_Name>
       <Token>0x00001004</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFileSystem</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
@@ -342,7 +301,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtMemorySize</C_Name>
       <Token>0x00001005</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtMemorySize</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"64!64"</DefaultValue>
@@ -351,7 +310,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
       <Token>0x00001005</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtMemorySizeForSecMain</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"64!64"</DefaultValue>
@@ -360,7 +319,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtBootMode</C_Name>
       <Token>0x00001006</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBootMode</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1</DefaultValue>
@@ -369,7 +328,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtCpuModel</C_Name>
       <Token>0x00001007</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtCpuModel</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
@@ -378,7 +337,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <Token>0x00001008</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtCpuSpeed</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"3000"</DefaultValue>
@@ -387,7 +346,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtFirmwareVolume</C_Name>
       <Token>0x00001009</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFirmwareVolume</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>
@@ -396,7 +355,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtConsole</C_Name>
       <Token>0x0000100a</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtConsole</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>
@@ -405,7 +364,7 @@
     <PcdEntry>
       <C_Name>PcdRothmanTest</C_Name>
       <Token>0x0000100b</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdRothmanTest</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
@@ -414,7 +373,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtBinaryPatch1</C_Name>
       <Token>0x0001000b</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch1</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x1234</DefaultValue>
@@ -423,7 +382,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtBinaryPatch2</C_Name>
       <Token>0x0001000c</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBinaryPatch2</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x5678</DefaultValue>
@@ -432,7 +391,7 @@
     <PcdEntry>
       <C_Name>PcdWinNtFeatureFlag1</C_Name>
       <Token>0x0001000d</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFeatureFlag1</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
       <DefaultValue>0x1</DefaultValue>
@@ -441,11 +400,11 @@
     <PcdEntry>
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
       <Token>0x0001000e</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtDynamicUINT32</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0</DefaultValue>
       <HelpText>HELP FIX ME!</HelpText>
     </PcdEntry>
   </PcdDeclarations>
-</PackageSurfaceArea>
+</PackageSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
index 0747c75..3635816 100644
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
+++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaLibHeader>
-    <BaseName>DxeWinNtLib</BaseName>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <MsaHeader>
+    <ModuleName>DxeWinNtLib</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>LIBRARY</ComponentType>
-    <Guid>f6b5871d-5226-41b3-a569-3ff893fdc7bc</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
+    <GuidValue>f6b5871d-5226-41b3-a569-3ff893fdc7bc</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-31 13:20</Updated>
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>
-  </MsaLibHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">WinNtLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
+    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>DxeWinNtLib</OutputFileBasename>
+  </ModuleDefinitions>
+  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <LibraryClass Usage="ALWAYS_PRODUCED">
+      <Keyword>WinNtLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles>
+  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Filename>WinNtLib.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">WinNtThunk</Protocol>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
+  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>WinNtThunk</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Externs>
+  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <Constructor>WinNtLibConstructor</Constructor>
     </Extern>
   </Externs>
-</LibraryModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index 598eca4..7a8a6ec 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -1,78 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaLibHeader>
-    <BaseName>EdkGenericBdsLib</BaseName>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <MsaHeader>
+    <ModuleName>EdkGenericBdsLib</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
-    <ComponentType>LIBRARY</ComponentType>
-    <Guid>1ec995b2-d15b-44f6-abd2-050ea7dd37d2</Guid>
-    <Version>0</Version>
+    <GuidValue>1ec995b2-d15b-44f6-abd2-050ea7dd37d2</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-13 17:00</Created>
-    <Updated>2006-03-23 12:01</Updated>
-    <Specification>0</Specification>
-  </MsaLibHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">EdkGenericBdsLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DxeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiRuntimeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>
+    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>EdkGenericBdsLib</OutputFileBasename>
+  </ModuleDefinitions>
+  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <LibraryClass Usage="ALWAYS_PRODUCED">
+      <Keyword>EdkGenericBdsLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DxeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PrintLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiRuntimeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DevicePathLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PerformanceLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles>
+  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Filename>BdsBoot.c</Filename>
     <Filename>BdsConsole.c</Filename>
     <Filename>BdsConnect.c</Filename>
     <Filename>DevicePath.c</Filename>
     <Filename>Performance.c</Filename>
     <Filename>BdsMisc.c</Filename>
-    <Arch ArchType="IPF">
-      <Filename>Ipf\ShadowRom.c</Filename>
-    </Arch>
+    <Filename SupArchList="IPF">Ipf\ShadowRom.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">LoadedImage</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">FirmwareVolume</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">AcpiS3Save</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">SimpleTextOut</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">SimpleTextIn</Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">SimpleNetwork</Protocol>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
+  <Protocols xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>LoadedImage</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>FirmwareVolume</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>AcpiS3Save</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>SimpleTextOut</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>SimpleTextIn</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>SimpleNetwork</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>ShellFile</C_Name>
-    </GuidEntry>
+  <Guids xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>ShellFile</GuidCName>
+    </GuidCNames>
   </Guids>
-</LibraryModuleSurfaceArea>
+  <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
+  </Externs>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
index c98b001..7c6140b 100644
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
+++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaLibHeader>
-    <BaseName>EdkNt32PeiPeCoffGetEntryPointLib</BaseName>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <MsaHeader>
+    <ModuleName>EdkNt32PeiPeCoffGetEntryPointLib</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>LIBRARY</ComponentType>
-    <Guid>434b164e-5fa6-4a3d-bc04-02da2a4eeb26</Guid>
-    <Version>0</Version>
+    <GuidValue>434b164e-5fa6-4a3d-bc04-02da2a4eeb26</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for the PEI library.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004 - 2005, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
-  </MsaLibHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">PeCoffGetEntryPointLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
+    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>EdkNt32PeiPeCoffGetEntryPointLib</OutputFileBasename>
+  </ModuleDefinitions>
+  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <LibraryClass Usage="ALWAYS_PRODUCED">
+      <Keyword>PeCoffGetEntryPointLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles>
+  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Filename>PeCoffGetEntryPoint.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">NtPeiLoadFile</Ppi>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
+  <PPIs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>NtPeiLoadFile</PpiCName>
+    </Ppi>
   </PPIs>
-</LibraryModuleSurfaceArea>
+  <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
+  </Externs>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
index 7015fc4..3b3c5ee 100644
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
+++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
@@ -1,53 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<LibraryModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <MsaLibHeader>
-    <BaseName>Nt32PeCoffLoaderLib</BaseName>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <MsaHeader>
+    <ModuleName>Nt32PeCoffLoaderLib</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>LIBRARY</ComponentType>
-    <Guid>3c5702f2-9b17-4273-b60c-b96e6cd13066</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
+    <GuidValue>3c5702f2-9b17-4273-b60c-b96e6cd13066</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for the PEI library.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004 - 2005, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-31 13:20</Updated>
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>
-  </MsaLibHeader>
-  <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_PRODUCED">EdkPeCoffLoaderLib</LibraryClass>
+    <License xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Nt32PeCoffLoaderLib</OutputFileBasename>
+  </ModuleDefinitions>
+  <LibraryClassDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <LibraryClass Usage="ALWAYS_PRODUCED">
+      <Keyword>EdkPeCoffLoaderLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
-  <SourceFiles>
+  <SourceFiles xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Filename>Nt32PeCoffLoader.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">PeCoffLoader</Ppi>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
+  <PPIs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>PeCoffLoader</PpiCName>
+    </Ppi>
   </PPIs>
-  <Externs>
+  <Externs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <Constructor>PeCoffLoaderConstructor</Constructor>
     </Extern>
   </Externs>
-</LibraryModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index aae557a..2257800 100644
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -1,48 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>Logo</BaseName>
-    <ModuleType>BASE</ModuleType>
-    <ComponentType>LOGO</ComponentType>
-    <Guid>7BB28B99-61BB-11D5-9A5D-0090273FC14D</Guid>
-    <Version>0</Version>
+    <ModuleName>Logo</ModuleName>
+    <ModuleType>USER_DEFINED</ModuleType>
+    <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for creating a Logo file.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Logo</OutputFileBasename>
+  </ModuleDefinitions>
   <SourceFiles>
-    <Filename FileType="Graphics">Logo.bmp</Filename>
+    <Filename>Logo.bmp</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+  </PackageDependencies>
   <Externs>
-    <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
-    </Extern>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
-  <BuildOptions>
-    <Option>BUILD_TYPE=CUSTOM_BUILD</Option>
-  </BuildOptions>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Logo/Logo_build.xml b/EdkNt32Pkg/Logo/Logo_build.xml
index bbc8b00..32e340d 100644
--- a/EdkNt32Pkg/Logo/Logo_build.xml
+++ b/EdkNt32Pkg/Logo/Logo_build.xml
@@ -55,12 +55,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <file name="${DEST_DIR_OUTPUT}\Logo.bin"/>
       </sourcefiles>
       <targetfiles>
-        <file name="${BIN_DIR}\7BB28B99-61BB-11D5-9A5D-0090273FC14D-Logo.FFS"/>
+        <file name="${BIN_DIR}\${FILE_GUID}-Logo.FFS"/>
       </targetfiles>
       
       <sequential>
         <genffsfile BaseName="Logo" ffsATTRIBCHECKSUM="TRUE"
-          ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM" fileGuid="7BB28B99-61BB-11D5-9A5D-0090273FC14D"
+          ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM" fileGuid="${FILE_GUID}"
           outputDir="${BIN_DIR}">
           <compress compressName="dummy">
             <tool outputPath="${DEST_DIR_OUTPUT}" toolName="${WORKSPACE_DIR}\Tools\Bin\GenCRC32Section">
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ed7a5e6..f1ed57c 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1,40 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
-  <PlatformHeader>
+<?xml version="1.0" encoding="UTF-8"?>
+<PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+  <PlatformHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <PlatformName>NT32</PlatformName>
     <GuidValue>eb216561-961f-47ee-9ef9-ca426ef547c2</GuidValue>
     <Version>0.3</Version>
     <Abstract>EFI/Framework Emulation Platform</Abstract>
-    <Description>
-      The Emulation Platform can be used to debug individual modules, prior to creating
-      a real platform. This also provides an example for how an FPD is created.
-    </Description>
+    <Description>The Emulation Platform can be used to debug individual modules, prior to creating
+      a real platform. This also provides an example for how an FPD is created.</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <CreatedDate>2006-02-23 18:21</CreatedDate>
-    <ModifiedDate>2006-06-03 20:20</ModifiedDate>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
-  <Flash>
+  <PlatformDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BuildTargets>DEBUG</BuildTargets>
+    <IntermediateDirectories>UNIFIED</IntermediateDirectories>
+    <OutputDirectory/>
+  </PlatformDefinitions>
+  <Flash xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <FlashDefinitionFile>FlashMap.fdf</FlashDefinitionFile>
+    <!-- FlashDefinitionFile -->
     <FvImages>
-      <!-- Global Variables -->
-      <NameValue Name="FV_RECOVERY_BASE_ADDRESS" Value="0xFFD80000"/>
-      <NameValue Name="FV_MAIN_BASE_ADDRESS" Value="0xFFF00000"/>
+      <!-- Global Varables -->
+      <NameValue Name="FV_RECOVERY_BASE_ADDRESS" Value="0xFFD80000" />
+      <NameValue Name="FV_MAIN_BASE_ADDRESS" Value="0xFFF00000" />
+      
       <!-- Define Valid Image Names -->
-      <FvImage Type="ValidImageNames">
+      <FvImage Type="ImageName">
         <FvImageNames>FV_RECOVERY</FvImageNames>
-        <!-- <FvImageNames>FV_FILE</FvImageNames> This is not defined for Nt32 -->
         <FvImageNames>NV_STORAGE</FvImageNames>
       </FvImage>
+
       <!-- Define Attributes for on or more Images Names -->
       <FvImage Type="Attributes">
         <FvImageNames>FV_RECOVERY</FvImageNames>
@@ -42,35 +44,36 @@
         <FvImageNames>FV_FILE</FvImageNames>
         <FvImageOptions>
           <NameValue Name="EFI_ERASE_POLARITY" Value="1"/>
-          <Enable>EFI_READ_DISABLED_CAP</Enable>
-          <Enable>EFI_READ_ENABLED_CAP</Enable>
-          <Enable>EFI_READ_STATUS</Enable>
-          <Enable>EFI_WRITE_DISABLED_CAP</Enable>
-          <Enable>EFI_WRITE_ENABLED_CAP</Enable>
-          <Enable>EFI_WRITE_STATUS</Enable>
-          <Enable>EFI_LOCK_CAP</Enable>
-          <Enable>EFI_LOCK_STATUS</Enable>
-          <Enable>EFI_MEMORY_MAPPED</Enable>
-          <Enable>EFI_ALIGNMENT_CAP</Enable>
-          <Enable>EFI_ALIGNMENT_2</Enable>
-          <Enable>EFI_ALIGNMENT_4</Enable>
-          <Enable>EFI_ALIGNMENT_8</Enable>
-          <Enable>EFI_ALIGNMENT_16</Enable>
-          <Enable>EFI_ALIGNMENT_32</Enable>
-          <Enable>EFI_ALIGNMENT_64</Enable>
-          <Enable>EFI_ALIGNMENT_128</Enable>
-          <Enable>EFI_ALIGNMENT_256</Enable>
-          <Enable>EFI_ALIGNMENT_512</Enable>
-          <Enable>EFI_ALIGNMENT_1K</Enable>
-          <Enable>EFI_ALIGNMENT_2K</Enable>
-          <Enable>EFI_ALIGNMENT_4K</Enable>
-          <Enable>EFI_ALIGNMENT_8K</Enable>
-          <Enable>EFI_ALIGNMENT_16K</Enable>
-          <Enable>EFI_ALIGNMENT_32K</Enable>
-          <Enable>EFI_ALIGNMENT_64K</Enable>
-          <Disable>EFI_STICKY_WRITE</Disable>
+          <NameValue Name="EFI_READ_DISABLED_CAP" Value="TRUE" />
+          <NameValue Name="EFI_READ_ENABLED_CAP" Value="TRUE" />
+          <NameValue Name="EFI_READ_STATUS" Value="TRUE" />
+          <NameValue Name="EFI_WRITE_DISABLED_CAP" Value="TRUE" />
+          <NameValue Name="EFI_WRITE_ENABLED_CAP" Value="TRUE" />
+          <NameValue Name="EFI_WRITE_STATUS" Value="TRUE" />
+          <NameValue Name="EFI_LOCK_CAP" Value="TRUE" />
+          <NameValue Name="EFI_LOCK_STATUS" Value="TRUE" />
+          <NameValue Name="EFI_MEMORY_MAPPED" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_CAP" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_2" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_4" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_8" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_16" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_32" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_64" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_128" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_256" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_512" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_1K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_2K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_4K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_8K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_16K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_32K" Value="TRUE" />
+          <NameValue Name="EFI_ALIGNMENT_64K" Value="TRUE" />
+          <NameValue Name="EFI_STICKY_WRITE" Value="FALSE" />
         </FvImageOptions>
       </FvImage>
+
       <!-- Define Components for one or more Image Names -->
       <FvImage Type="Components">
         <FvImageNames>NV_STORAGE</FvImageNames>
@@ -81,16 +84,20 @@
           <NameValue Name="EFI_NV_FTW_SPARE" Value="0x10000"/>
         </FvImageOptions>
       </FvImage>
+
       <!-- Define Options for Individual Image Names -->
-      <FvImageName Name="FV_RECOVERY">
+      <FvImage Type="Options">
+        <FvImageNames>FV_RECOVERY</FvImageNames>
         <FvImageOptions>
           <NameValue Name="EFI_BASE_ADDRESS" Value="${FV_RECOVERY_BASE_ADDRESS}"/>
           <NameValue Name="EFI_FILE_NAME" Value="FV_RECOVERY.fv"/>
           <NameValue Name="EFI_NUM_BLOCKS" Value="0x28"/>
           <NameValue Name="EFI_BLOCK_SIZE" Value="0x10000"/>
         </FvImageOptions>
-      </FvImageName>
-      <FvImageName Name="FV_FILE">
+      </FvImage>
+
+      <FvImage Type="Options">
+        <FvImageNames>FV_FILE</FvImageNames>
         <FvImageOptions>
           <NameValue Name="EFI_BASE_ADDRESS" Value="0x00000000"/>
           <NameValue Name="EFI_FILE_NAME" Value="${FV_FILENAME}.fv"/>
@@ -98,8 +105,10 @@
           <NameValue Name="EFI_NUM_BLOCKS" Value="0x2"/>
           <NameValue Name="EFI_BLOCK_SIZE" Value="0x10000"/>
         </FvImageOptions>
-      </FvImageName>
-      <FvImageName Name="NV_STORAGE">
+      </FvImage>
+
+      <FvImage Type="Options">
+        <FvImageNames>NV_STORAGE</FvImageNames>
         <FvImageOptions>
           <NameValue Name="EFI_BASE_ADDRESS" Value="0xFFFC0000"/>
           <NameValue Name="EFI_FILE_NAME" Value="${FV_FILENAME}.fv"/>
@@ -107,5277 +116,6315 @@
           <NameValue Name="EFI_BLOCK_SIZE" Value="0x10000"/>
           <NameValue Name="EFI_FV_GUID" Value="fff12b8d-7696-4c8b-a985-2747075b4f50"/>
         </FvImageOptions>
-      </FvImageName>
-    </FvImages>
-    <Capsules>
-      <Capsule>
-        <CapsuleId>A</CapsuleId>
-        <CapsuleOptions>
+      </FvImage>
+
+      <FvImage Type="Options">
+        <FvImageNames>CAPSULE_A</FvImageNames>
+        <FvImageOptions>
           <NameValue Name="EFI_BASE_ADDRESS" Value="${FV_RECOVERY_BASE_ADDRESS}"/>
           <NameValue Name="EFI_FILE_NAME" Value="Capsule_A.fv"/>
           <NameValue Name="EFI_NUM_BLOCKS" Value="0x28"/>
           <NameValue Name="EFI_BLOCK_SIZE" Value="0x10000"/>
-        </CapsuleOptions>
-      </Capsule>
-    </Capsules>
+        </FvImageOptions>
+      </FvImage>
+    </FvImages>
   </Flash>
-  <TianoImage>
-    <SEC>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain"/>
-    </SEC>
-    <PEI_CORE>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiMain">
-        <Includes>
-          <Arch ArchType="IA32">
-            <PackageName>EdkNt32Pkg</PackageName>
-          </Arch>
-        </Includes>
-        <Libraries>
-          <Arch ArchType="IA32">
-            <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>
-          </Arch>
-        </Libraries>
-      </ModuleSA>
-    </PEI_CORE>
-    <PEIM>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">
-        <Libraries>
-          <Arch ArchType="IA32">
-            <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>
-          </Arch>
-        </Libraries>
-      </ModuleSA>
-    </PEIM>
-    <DXE_CORE>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain"/>
-    </DXE_CORE>
-    <DXE_DRIVERS>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub"/>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort"/>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat"/>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld"/>
-    </DXE_DRIVERS>
-  </TianoImage>
-  <FrameworkModules>
-    <SEC>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtCpuModel</C_Name>
-            <Token>0x00001007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>48</MaxDatumSize>
-            <Value>L"Intel(R) Processor Model"</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdWinNtFirmwareVolume</C_Name>
-            <Token>0x00001009</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>52</MaxDatumSize>
-            <Value>L"..\\..\\Fv\\Fv_Recovery.fd"</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdWinNtBootMode</C_Name>
-            <Token>0x00001006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtMemorySize</C_Name>
-            <Token>0x00001005</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>10</MaxDatumSize>
-            <Value>L"64!64"</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
-            <Token>0x00001005</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>10</MaxDatumSize>
-            <Value>L"64!64"</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-    </SEC>
-    <PEI_CORE>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiMain">
-        <Includes>
-          <Arch ArchType="IA32">
-            <PackageName>EdkNt32Pkg</PackageName>
-          </Arch>
-        </Includes>
-        <Libraries>
-          <Arch ArchType="IA32">
-            <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>
-          </Arch>
-        </Libraries>
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-            <Token>0x00000009</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-    </PEI_CORE>
-    <PEIM>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">
-        <PcdBuildDefinition>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdKentTestDynamicUINT32</C_Name>
-            <Token>0x0001000e</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-          </PcdData>        
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-            <Token>0x0001000f</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            
-            <Value>0x8</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdVpdBaseAddress</C_Name>
-            <Token>0x00010010</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            
-            <Value>0x0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">
-        <Libraries>
-          <Arch ArchType="IA32">
-            <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>
-          </Arch>
-        </Libraries>
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-    </PEIM>
-    <DXE_CORE>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-            <Token>0x00000009</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-    </DXE_CORE>
-    <DXE_DRIVERS>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-            <Token>0x0001000f</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            
-            <Value>0x8</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdVpdBaseAddress</C_Name>
-            <Token>0x00010010</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            
-            <Value>0x0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-            <Token>0x00000009</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-            <Token>0x00000009</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            
-            <Value>0</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtMemorySize</C_Name>
-            <Token>0x00001005</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>10</MaxDatumSize>
-            <Value>L"64!64"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtPhysicalDisk</C_Name>
-            <Token>0x00001000</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>24</MaxDatumSize>
-            <Value>L"FW;40960;512"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtVirtualDisk</C_Name>
-            <Token>0x00001001</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>24</MaxDatumSize>
-            <Value>L"FW;40960;512"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtSerialPort</C_Name>
-            <Token>0x00001002</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>18</MaxDatumSize>
-            <Value>L"COM1!COM2"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtUga</C_Name>
-            <Token>0x00001003</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>50</MaxDatumSize>
-            <Value>L"UGA Window 1!UGA Window 2"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtCpuModel</C_Name>
-            <Token>0x00001007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>48</MaxDatumSize>
-            <Value>L"Intel(R) Processor Model"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtFileSystem</C_Name>
-            <Token>0x00001004</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>120</MaxDatumSize>
-            <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtConsole</C_Name>
-            <Token>0x0000100a</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>50</MaxDatumSize>
-            <Value>L"Bus Driver Console Window"</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtCpuSpeed</C_Name>
-            <Token>0x00001008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>VOID*</DatumType>
-            <MaxDatumSize>8</MaxDatumSize>
-            <Value>L"3000"</Value>
-          </PcdData>
-          <PcdData ItemType="FEATURE_FLAG">
-            <C_Name>PcdWinNtFeatureFlag1</C_Name>
-            <Token>0x0001000d</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>BOOLEAN</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>TRUE</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdWinNtBinaryPatch1</C_Name>
-            <Token>0x0001000b</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x1234</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdWinNtBinaryPatch2</C_Name>
-            <Token>0x0001000c</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x5678</Value>
-          </PcdData>
-          <PcdData ItemType="DYNAMIC">
-            <C_Name>PcdWinNtDynamicUINT32</C_Name>
-            <Token>0x0001000e</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x0</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld">
-        <PcdBuildDefinition>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>
-            <Token>0x00000001</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>
-            <Token>0x00000002</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugPropertyMask</C_Name>
-            <Token>0x00000005</Token>
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x1f</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdSpinLockTimeout</C_Name>
-            <Token>0x00000004</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>10000000</Value>
-          </PcdData>
-          <PcdData ItemType="PATCHABLE_IN_MODULE">
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>
-            <Token>0x00000006</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>0x80000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>
-            <Token>0x00000007</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0x07</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdMaximumLinkedListLength</C_Name>
-            <Token>0x00000003</Token>
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
-            <DatumType>UINT32</DatumType>
-            <MaxDatumSize>4</MaxDatumSize>
-            <Value>1000000</Value>
-          </PcdData>
-          <PcdData ItemType="FIXED_AT_BUILD">
-            <C_Name>PcdDebugClearMemoryValue</C_Name>
-            <Token>0x00000008</Token>
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
-            <DatumType>UINT8</DatumType>
-            <MaxDatumSize>1</MaxDatumSize>
-            <Value>0xAF</Value>
-          </PcdData>
-        </PcdBuildDefinition>
-      </ModuleSA>
-    </DXE_DRIVERS>
+  <FrameworkModules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="4b837b03-6587-4d19-b82b-edfad836c0a0">
+      <Libraries>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="55c61087-7367-4546-bc32-4937c5e6aff3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtCpuModel</C_Name>
+          <Token>0x00001007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>48</MaxDatumSize>
+          <Value>L"Intel(R) Processor Model"</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdWinNtFirmwareVolume</C_Name>
+          <Token>0x00001009</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>52</MaxDatumSize>
+          <Value>L"..\\..\\Fv\\Fv_Recovery.fd"</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdWinNtBootMode</C_Name>
+          <Token>0x00001006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtMemorySize</C_Name>
+          <Token>0x00001005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>10</MaxDatumSize>
+          <Value>L"64!64"</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
+          <Token>0x00001005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>10</MaxDatumSize>
+          <Value>L"64!64"</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>NULL</FvBinding>
+        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="52C05B14-0B98-496c-BC3B-04B50211D680">
+      <Libraries>
+        <Instance ModuleGuid="434b164e-5fa6-4a3d-bc04-02da2a4eeb26" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="b3b0654a-969d-4096-86cb-27e262a02083" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
+          <Token>0x00000009</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PEI_CORE</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="9B3ADA4F-AE56-4c24-8DEA-F03B7558AE50">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b694e0dc-cd4e-4b30-885b-9c164ed3e74a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdKentTestDynamicUINT32</C_Name>
+          <Token>0x0001000e</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
+          <Token>0x0001000f</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x8</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdVpdBaseAddress</C_Name>
+          <Token>0x00010010</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="1501614E-0E6C-4ef4-8B8F-C276CDFB646F">
+      <Libraries>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="e2368d1d-4c94-4e62-be2f-7817bbd78293" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="B7611005-1F26-45ba-A3DB-01F39DDB2785">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="681F3771-6F1D-42DE-9AA2-F82BBCDBC5F9">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="736EB068-8C01-47c5-964B-1C57BD5D4D64">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="34C8C28F-B61C-45a2-8F2E-89E46BECC63B">
+      <Libraries>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="BE0FEABA-3443-4919-9F3A-2D4216329EA9">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="F0384FFD-8633-452f-9010-F6B7D2EAE2F1">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755">
+      <Libraries>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="86D70125-BAA3-4296-A62F-602BEBBB9081">
+      <Libraries>
+        <Instance ModuleGuid="3c5702f2-9b17-4273-b60c-b96e6cd13066" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="fa177ff7-1fc7-458d-a358-d9d62ae61cec" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a9759d2-53bc-4eb2-abcd-c93099419063" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9643128f-ac24-4b3e-b6be-d8849a306153" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="123dd843-57c9-4158-8418-ce68b3944ce7" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="d774c4d9-c121-4da3-a5e2-0f317e3c630c" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="e5566134-c75e-4ace-bad1-e23a3b335e30" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="8c690838-7a22-45c4-aa58-a33e3e515cd4" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b694e0dc-cd4e-4b30-885b-9c164ed3e74a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <!--Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/-->
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>PE32_PEIM</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="D6A2CB7F-6A18-4e2f-B43B-9920A733700A">
+      <Libraries>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="123dd843-57c9-4158-8418-ce68b3944ce7" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="5c12c06f-5cf8-48a6-9860-6c5b2c036bbf" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="cef487a1-751d-4fe0-a39b-e6892b4610c8" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="942e0182-3e1d-47f9-92dc-4939d1a0ba00" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="ed3de5c8-c389-44f2-a35e-2ebdc9802a49" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="882ee1a3-35b2-412c-b8a2-7a8d34a7c390" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="d258d6af-2fc0-4019-9c1f-1101c3dd19b5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
+          <Token>0x00000009</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>DXE_CORE</FfsFormatKey>
+        <Options>
+	        <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+	          "/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", "/FI${DEST_DIR_DEBUG}/AutoGen.h", "/Ob0"
+	        </Option>
+	        <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+	          "/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/GL", "/G7", "/Gy", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+	        </Option>
+        </Options>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="80CF7257-87AB-47f9-A3FE-D50B76D89541">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
+          <Token>0x0001000f</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x8</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdVpdBaseAddress</C_Name>
+          <Token>0x00010010</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="51C9F40C-5243-4473-B265-B3C8FFAFF9FA">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="ee993080-5197-4d4e-b63c-f1f7413e33ce">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+        <Options>
+          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+            "/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\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+          </Option> 
+          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+            "/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/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\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+          </Option>  
+        </Options> 
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="154CAB4A-52B5-46CD-99C3-4368ABBACFFD">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="C3811036-710B-4E39-8CF1-0AF9BE3A8198">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="27F05AF5-1644-4EF4-8944-48C4F75675A0">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="BA929954-35B0-4dd3-90CD-9634BD7E1CF1">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="A6F691AC-31C8-4444-854C-E2C1A6950F92">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="baa1baa3-0a8d-402c-8042-985115fae953" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1ec995b2-d15b-44f6-abd2-050ea7dd37d2" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="08c1a0e4-1208-47f8-a2c5-f42eabee653a" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="ea55bada-d488-427b-9d2d-227e0aaa3707" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
+          <Token>0x00000009</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="B601F8C4-43B7-4784-95B1-F4226CB40CEE">
+      <Libraries>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>RT_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="AD608272-D07F-4964-801E-7BD3B7888652">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>RT_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="9F455D3B-2B8A-4c06-960B-A71B9714B9CD">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="e94cd42a-3aad-4ea0-9b09-945891c60ccd" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="68b157b5-9534-43ff-9cd3-6705e4e1d56c" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="1517564b-ab66-42b7-8903-731a95f314f9" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="041bf780-dc3e-49ab-8d67-4b86075440ea" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="e2368d1d-4c94-4e62-be2f-7817bbd78293" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>RT_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="baa1baa3-0a8d-402c-8042-985115fae953" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>RT_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="4C862FC6-0E54-4e36-8C8F-FF6F3167951F">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="CBD2E4D5-7068-4FF5-B462-9822B4AD8D60">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="baa1baa3-0a8d-402c-8042-985115fae953" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bd4d540e-04b0-4b10-8fd5-4a7bb533cf67" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>RT_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="F80697E9-7FD6-4665-8646-88E33EF71DFC">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="73E9457A-CEA1-4917-9A9C-9F1F0F0FD322">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>NULL</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="911D584C-35F7-4955-BEF9-B452769DDC3A">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>NULL</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="51ccf399-4fdf-4e55-a45b-e123f84d456a">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="408edcec-cf6d-477c-a5a8-b4844e3de281">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="CCCB0C28-4B24-11d5-9A5A-0090273FC14D">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="9E863906-A40F-4875-977F-5B93FF237FC6">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="53BCC14F-C24F-434C-B294-8ED2D4CC1860">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="CA515306-00CE-4032-874E-11B755FF6866">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="6B38F7B4-AD98-40e9-9093-ACA2B5A253C4">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="96B5C032-DF4C-4b6e-8232-438DCF448D0E">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="baa1baa3-0a8d-402c-8042-985115fae953" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="FCD337AB-B1D3-4EF8-957C-8048606FF670">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="ea55bada-d488-427b-9d2d-227e0aaa3707" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="1FA1F39E-FEFF-4aae-BD7B-38A070A3B609">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="7BB28B99-61BB-11D5-9A5D-0090273FC14D">
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="93B80004-9FB3-11d4-9A3A-0090273FC14D">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="EBf342FE-B1D3-4EF8-957C-8048606FF670">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="08c1a0e4-1208-47f8-a2c5-f42eabee653a" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="FE3542FE-C1D3-4EF8-657C-8048606FF670">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="08c1a0e4-1208-47f8-a2c5-f42eabee653a" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="ea55bada-d488-427b-9d2d-227e0aaa3707" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="E49061CE-99A7-41d3-AB3A-36E5CFBAD63E">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="555F76EA-785F-40d7-9174-153C43636C68">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="69FD8E47-A161-4550-B01A-5594CEB2B2B2">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
+          <Token>0x00000009</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="2FB92EFA-2EE0-4bae-9EB6-7464125E1EF7">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="0167CCC4-D0F7-4f21-A3EF-9E64B7CDCE8B">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="46c9adef-aee6-410c-99e4-240e3af18d8b" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="0A66E322-3740-4cce-AD62-BD172CECCA35">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="46c9adef-aee6-410c-99e4-240e3af18d8b" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="B40612B9-A063-11d4-9A3A-0090273FC14D">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="240612B7-A063-11d4-9A3A-0090273FC14D">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="A3527D16-E6CC-42f5-BADB-BF3DE177742B">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="B40612B2-A063-11d4-9A3A-0090273FC14D">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="2D2E62CF-9ECF-43b7-8219-94E7FC713DFE">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="A5C6D68B-E78A-4426-9278-A8F0D9EB4D8F">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="2D2E62AA-9ECF-43b7-8219-94E7FC713DFE">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="87eb5df9-722a-4241-ad7f-370d0b3a56d7" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="A3f436EA-A127-4EF8-957C-8048606FF670">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="a46c3330-be36-4977-9d24-a7cf92eef0fe">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="A2f436EA-A127-4EF8-957C-8048606FF670">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="0C95A916-A006-11d4-BCFA-0080C73C8881">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f12b59c9-76d0-4661-ad7c-f04d1bef0558" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="BD7E9A27-D6C5-416a-B245-5F507D95B2BD">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="af97eb89-4cc6-45f8-a514-ca025b346480" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtMemorySize</C_Name>
+          <Token>0x00001005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>10</MaxDatumSize>
+          <Value>L"64!64"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtPhysicalDisk</C_Name>
+          <Token>0x00001000</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>24</MaxDatumSize>
+          <Value>L"FW;40960;512"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtVirtualDisk</C_Name>
+          <Token>0x00001001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>24</MaxDatumSize>
+          <Value>L"FW;40960;512"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtSerialPort</C_Name>
+          <Token>0x00001002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>18</MaxDatumSize>
+          <Value>L"COM1!COM2"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtUga</C_Name>
+          <Token>0x00001003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>50</MaxDatumSize>
+          <Value>L"UGA Window 1!UGA Window 2"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtCpuModel</C_Name>
+          <Token>0x00001007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>48</MaxDatumSize>
+          <Value>L"Intel(R) Processor Model"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtFileSystem</C_Name>
+          <Token>0x00001004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>120</MaxDatumSize>
+          <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtConsole</C_Name>
+          <Token>0x0000100a</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>50</MaxDatumSize>
+          <Value>L"Bus Driver Console Window"</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtCpuSpeed</C_Name>
+          <Token>0x00001008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>VOID*</DatumType>
+          <MaxDatumSize>8</MaxDatumSize>
+          <Value>L"3000"</Value>
+        </PcdData>
+        <PcdData ItemType="FEATURE_FLAG">
+          <C_Name>PcdWinNtFeatureFlag1</C_Name>
+          <Token>0x0001000d</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>BOOLEAN</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>TRUE</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdWinNtBinaryPatch1</C_Name>
+          <Token>0x0001000b</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x1234</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdWinNtBinaryPatch2</C_Name>
+          <Token>0x0001000c</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x5678</Value>
+        </PcdData>
+        <PcdData ItemType="DYNAMIC">
+          <C_Name>PcdWinNtDynamicUINT32</C_Name>
+          <Token>0x0001000e</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x0</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="F479E147-A125-11d4-BCFC-0080C73C8881">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="263631d7-5836-4b74-be48-ee22e92ce5d3">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="6B41B553-A649-11d4-BD02-0080C73C8881">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="9C25E18B-76BA-43da-A132-DBB0997CEFEF">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="AB248E8D-ABE1-11d4-BD0D-0080C73C8881">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="4A9B9DB8-EC62-4A92-818F-8AA0246D246E">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="d4266a1b-1d38-4116-93ae-60dc3e2012a6" ModuleGuid="c57ad6b7-0515-40a8-9d21-551652854e37">
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>APPLICATION</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="8EA68A2C-99CB-4332-85C6-DD5864EAA674" ModuleGuid="961578FE-B6B7-44c3-AF35-6BC705CD2B1F">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
+    <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">
+      <Libraries>
+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      </Libraries>
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>
+          <Token>0x00000001</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumAsciiStringLength</C_Name>
+          <Token>0x00000002</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugPropertyMask</C_Name>
+          <Token>0x00000005</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x1f</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdSpinLockTimeout</C_Name>
+          <Token>0x00000004</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>10000000</Value>
+        </PcdData>
+        <PcdData ItemType="PATCHABLE_IN_MODULE">
+          <C_Name>PcdDebugPrintErrorLevel</C_Name>
+          <Token>0x00000006</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>0x80000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>
+          <Token>0x00000007</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0x07</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdMaximumLinkedListLength</C_Name>
+          <Token>0x00000003</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>1000000</Value>
+        </PcdData>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdDebugClearMemoryValue</C_Name>
+          <Token>0x00000008</Token>
+          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
+          <DatumType>UINT8</DatumType>
+          <MaxDatumSize>1</MaxDatumSize>
+          <Value>0xAF</Value>
+        </PcdData>
+      </PcdBuildDefinition>
+      <ModuleSaBuildOptions>
+        <FvBinding>FV_RECOVERY</FvBinding>
+        <FfsFormatKey>APPLICATION</FfsFormatKey>
+      </ModuleSaBuildOptions>
+    </ModuleSA>
   </FrameworkModules>
-  <DynamicPcdBuildDefinitions>
+  <DynamicPcdBuildDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtMemorySize</C_Name>
       <Token>0x00001005</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>10</MaxDatumSize>
       <SkuInfo>
@@ -5388,7 +6435,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuModel</C_Name>
       <Token>0x00001007</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>48</MaxDatumSize>
       <SkuInfo>
@@ -5399,7 +6446,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <Token>0x00001000</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>24</MaxDatumSize>
       <SkuInfo>
@@ -5410,7 +6457,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <Token>0x00001001</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>24</MaxDatumSize>
       <SkuInfo>
@@ -5421,7 +6468,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtFileSystem</C_Name>
       <Token>0x00001004</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>120</MaxDatumSize>
       <SkuInfo>
@@ -5432,7 +6479,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtSerialPort</C_Name>
       <Token>0x00001002</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>18</MaxDatumSize>
       <SkuInfo>
@@ -5443,7 +6490,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtConsole</C_Name>
       <Token>0x0000100a</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>50</MaxDatumSize>
       <SkuInfo>
@@ -5454,7 +6501,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtUga</C_Name>
       <Token>0x00001003</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>50</MaxDatumSize>
       <SkuInfo>
@@ -5465,7 +6512,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint8</C_Name>
       <Token>0x00011000</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT8</DatumType>
       <MaxDatumSize>1</MaxDatumSize>
       <SkuInfo>
@@ -5476,18 +6523,18 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint16</C_Name>
       <Token>0x00011001</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT16</DatumType>
       <MaxDatumSize>2</MaxDatumSize>
       <SkuInfo>
-        <SkuId>0</SkuId>
- 
+        <SkuId>0</SkuId>
         <Value>0x1234</Value>
       </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint32</C_Name>
       <Token>0x00011002</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <MaxDatumSize>4</MaxDatumSize>
       <SkuInfo>
@@ -5498,7 +6545,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint64</C_Name>
       <Token>0x00011003</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT64</DatumType>
       <MaxDatumSize>8</MaxDatumSize>
       <SkuInfo>
@@ -5509,7 +6556,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicBoolean</C_Name>
       <Token>0x00011004</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <MaxDatumSize>1</MaxDatumSize>
       <SkuInfo>
@@ -5520,7 +6567,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <Token>0x00001008</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <MaxDatumSize>8</MaxDatumSize>
       <SkuInfo>
@@ -5531,7 +6578,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
       <Token>0x0001000e</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <MaxDatumSize>4</MaxDatumSize>
       <SkuInfo>
@@ -5542,7 +6589,7 @@
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdKentTestDynamicUINT32</C_Name>
       <Token>0x0001000e</Token>
-      <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
+      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>
       <DatumType>UINT32</DatumType>
       <MaxDatumSize>4</MaxDatumSize>
       <SkuInfo>
@@ -5551,14 +6598,298 @@
         <VariableGuid>WinNPassThrough</VariableGuid>
         <VariableOffset>0x123</VariableOffset>
         <HiiDefaultValue>0x123</HiiDefaultValue>
-        </SkuInfo>
+      </SkuInfo>
     </PcdBuildData>
   </DynamicPcdBuildDefinitions>
   <BuildOptions>
-    <OutputDirectory IntermediateDirectories="UNIFIED"/>
-    <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>
-    <Option>LIB_FLAGS = "/NOLOGO", "/LTCG"</Option>
-    <Option>LINK_FLAGS = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/DEF:${PLATFORM_DIR}\Build\component.def", "/NODEFAULTLIB", "/IGNORE:4086", "/OPT:REF", "/MAP", "/DEBUG", "/MACHINE:I386", "/LTCG", "/DLL"</Option>
-    <Option>ASM_FLAGS = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR"</Option>
+    <Options>
+      <!-- MSFT tool chain options definition : IA32 -->
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+        "/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\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+      </Option>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
+        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/DEF:${PLATFORM_DIR}\Build\component.def", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
+      </Option>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
+        "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
+      </Option>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
+      
+      <!-- MSFT tool chain options definition : IA32 -->
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">
+        "/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/Od", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\"", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+      </Option>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="SLINK"> "/NOLOGO", "/LTCG"</Option>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">
+        "/NODEFAULTLIB", "/LTCG", "/DLL", "/OPT:REF", "/DEF:${PLATFORM_DIR}\Build\component.def", "/IGNORE:4086", "/MAP", "/MACHINE:I386", "/NOLOGO", "/DEBUG", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:CONSOLE", "/MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map", "/PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb"
+      </Option>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
+        "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
+      </Option>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
+    </Options>
+
+    <Ffs FfsKey="APPLICATION">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="FILE">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_RAW"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="Apriori">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_RAW"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="Logo">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_RAW"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="RAWFILE">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_RAW"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="Legacy16">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_RAW"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="BINARY">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_RAW"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="PE32_PEIM_TE_PEIM">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	      <Section SectionType="EFI_SECTION_TE"/>
+	      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	      <Section SectionType="EFI_SECTION_VERSION"/>
+	    </Sections>
+	  </Ffs>
+	  <Ffs FfsKey="Config_Config">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_RAW"/>
+	    </Sections>
+	  </Ffs>
+
+	  <Ffs FfsKey="BS_DRIVER_Ifr_Bin">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	        <Section SectionType="EFI_SECTION_RAW"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	
+	  <Ffs FfsKey="PEI_CORE">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PE32"/>
+	      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	      <Section SectionType="EFI_SECTION_VERSION"/>
+	    </Sections>
+	  </Ffs>
+
+	  <Ffs FfsKey="PE32_PEIM">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	      <Section SectionType="EFI_SECTION_PE32"/>
+	      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	      <Section SectionType="EFI_SECTION_VERSION"/>
+	    </Sections>
+	  </Ffs>
+
+	  <Ffs FfsKey="PE32_PEIM_Relocatable">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	      <Section SectionType="EFI_SECTION_PE32"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="PE32_PEIM_CompressPEIM">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	      <Sections EncapsulationType="Compress">
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="COMBINED_PEIM_DRIVER">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+	      <!--Section SectionType="EFI_SECTION_UNKNOW"/-->
+	      <Section SectionType="EFI_SECTION_PE32"/>
+	      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	      <Section SectionType="EFI_SECTION_VERSION"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="DXE_CORE">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Section SectionType="EFI_SECTION_PE32"/>
+	      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	      <Section SectionType="EFI_SECTION_VERSION"/>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="BS_DRIVER">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="RT_DRIVER">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="SAL_RT_DRIVER">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="BS_DRIVER_EFI">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="RT_DRIVER_EFI">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	  
+	  <Ffs FfsKey="APPLICATION_EFI">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections EncapsulationType="Compress">
+	      <Sections EncapsulationType="Guid-Defined">
+	        <Section SectionType="EFI_SECTION_DXE_DEPEX"/>
+	        <Section SectionType="EFI_SECTION_PE32"/>
+	        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+	        <Section SectionType="EFI_SECTION_VERSION"/>
+	      </Sections>
+	    </Sections>
+	  </Ffs>
+	
+	  <Ffs FfsKey="Microcode">
+	    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_RAW"/>
+	    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+	    <Sections>
+	      <Section SectionType="EFI_SECTION_RAW"/>
+	    </Sections>
+	  </Ffs>
+
+    <Sections />
+
   </BuildOptions>
-</FrameworkPlatformDescription>
+  
+  <!--UserExtensions UserID="Fix_Me" Identifier="1">
+    <copy tofile="${FV_DIR}/FV_RECOVERY.fd">
+      <fileset dir="${FV_DIR}" includes="*.fv" />
+    </copy>
+  </UserExtensions-->
+</PlatformSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index 05781af..e27007e 100644
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -1,68 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtAutoScan</BaseName>
+    <ModuleName>WinNtAutoScan</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>BE0FEABA-3443-4919-9F3A-2D4216329EA9</Guid>
-    <Version>0</Version>
+    <GuidValue>BE0FEABA-3443-4919-9F3A-2D4216329EA9</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtAutoScan module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtAutoScan</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtAutoScan.c</Filename>
     <Filename>WinNtAutoscan.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <Hobs>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="RESOURCE_DESCRIPTOR">
-      <Name>EFI_RESOURCE_SYSTEM_MEMORY</Name>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="CPU"></Hob>
-  </Hobs>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">NtAutoScan</Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">BaseMemoryTest</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">MemoryDiscovered</Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>NtAutoScan</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>BaseMemoryTest</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>MemoryDiscovered</PpiCName>
+    </Ppi>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeimInitializeWinNtAutoScan</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
index 4c94945..e9fbd4c 100644
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa
+++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
@@ -1,59 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>BootMode</BaseName>
+    <ModuleName>BootMode</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>B7611005-1F26-45ba-A3DB-01F39DDB2785</Guid>
-    <Version>0</Version>
+    <GuidValue>B7611005-1F26-45ba-A3DB-01F39DDB2785</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for Fwh module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>BootMode</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>BootMode.c</Filename>
     <Filename>BootMode.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <PPIs>
-    <Ppi Usage="SOMETIMES_PRODUCED">BootInRecoveryMode</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">MasterBootMode</Ppi>
+    <Ppi Usage="SOMETIMES_PRODUCED">
+      <PpiCName>BootInRecoveryMode</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>MasterBootMode</PpiCName>
+    </Ppi>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InitializeBootMode</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
index b6cff5e..175ae50 100644
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
+++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
@@ -1,69 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtFwh</BaseName>
+    <ModuleName>WinNtFwh</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>F0384FFD-8633-452f-9010-F6B7D2EAE2F1</Guid>
-    <Version>0</Version>
+    <GuidValue>F0384FFD-8633-452f-9010-F6B7D2EAE2F1</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtFwh module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-23 10:33</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtFwh</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtFwh.c</Filename>
     <Filename>WinNtFwh.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
-  <Hobs>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="FIRMWARE_VOLUME">
-      <Name>FvRecovery.fv</Name>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="RESOURCE_DESCRIPTOR">
-      <Name>EFI_RESOURCE_FIRMWARE_DEVICE</Name>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="FIRMWARE_VOLUME">
-      <Name>NVSTORAGE.fv</Name>
-    </Hob>
-  </Hobs>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">NtFwh</Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>NtFwh</PpiCName>
+    </Ppi>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeimInitializeWinNtFwh</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index 6721999..8db7364 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -1,101 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>PeiFlashMap</BaseName>
+    <ModuleName>PeiFlashMap</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>681F3771-6F1D-42DE-9AA2-F82BBCDBC5F9</Guid>
-    <Version>0</Version>
+    <GuidValue>681F3771-6F1D-42DE-9AA2-F82BBCDBC5F9</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for FlashMap PEI module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-23 10:43</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>PeiFlashMap</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>FlashMap.c</Filename>
     <Filename>FlashMap.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">FirmwareVolumeBlock</Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Hobs>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>VariableArea</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>FtwBackupBlock</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>FtwStateArea</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>RecoveryBios</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>SystemNvDataHob</Name>
-      <C_Name>gEfiFlashMapHobGuid</C_Name>
-      <Guid>0xb091e7d2, 0x5a0, 0x4198, 0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59</Guid>
-    </Hob>
-  </Hobs>
   <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">FlashMap</Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">NtFwh</Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>FlashMap</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>NtFwh</PpiCName>
+    </Ppi>
   </PPIs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>FlashMapHob</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>FirmwareFileSystem</C_Name>
-    </GuidEntry>
-    <GuidEntry Usage="ALWAYS_CONSUMED">
-      <C_Name>SystemNvDataHob</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>FlashMapHob</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>FirmwareFileSystem</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>SystemNvDataHob</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeimInitializeFlashMap</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
index e5feb4d..0192f75 100644
--- a/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
+++ b/EdkNt32Pkg/Pei/MonoStatusCode/MonoStatusCode.msa
@@ -1,69 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>MonoStatusCode</BaseName>
+    <ModuleName>MonoStatusCode</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>1501614E-0E6C-4ef4-8B8F-C276CDFB646F</Guid>
-    <Version>0</Version>
+    <GuidValue>1501614E-0E6C-4ef4-8B8F-C276CDFB646F</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for DiskIo module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>MonoStatusCode</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkMemoryStatusCodeLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>EdkMemoryStatusCodeLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>MonoStatusCode.dxs</Filename>
     <Filename>MonoStatusCode.c</Filename>
     <Filename>PlatformStatusCode.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="SOMETIMES_CONSUMED">StatusCode</Protocol>
+    <Protocol Usage="SOMETIMES_CONSUMED">
+      <ProtocolCName>StatusCode</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Hobs>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>TranslateDxeStatusCodeToPeiStatusCode</Name>
-      <C_Name>gEfiStatusCodeRuntimeProtocolGuid</C_Name>
-      <Guid>0xd2b2b828, 0x826, 0x48a7, 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0</Guid>
-    </Hob>
-  </Hobs>
   <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">StatusCode</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">FvFileLoader</Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>StatusCode</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>FvFileLoader</PpiCName>
+    </Ppi>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>InstallMonoStatusCode</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index a227dd0..f2c4bcc 100644
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -1,68 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>WinNtStuff</BaseName>
+    <ModuleName>WinNtStuff</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</Guid>
-    <Version>0</Version>
+    <GuidValue>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for WinNtStuff module</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>WinNtStuff</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeimEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>WinNtStuff.c</Filename>
     <Filename>WinNtStuff.dxs</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">WinNtThunk</Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>WinNtThunk</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Hobs>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="GUID_EXTENSION">
-      <Name>WinNtThunkProtocol</Name>
-      <C_Name>gEfiWinNtThunkProtocolGuid</C_Name>
-      <Guid>0x58c518b1, 0x76f3, 0x11d4, 0xbc, 0xea, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81</Guid>
-    </Hob>
-  </Hobs>
   <PPIs>
-    <Ppi Usage="ALWAYS_CONSUMED">NtThunk</Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>NtThunk</PpiCName>
+    </Ppi>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeimInitializeWinNtStuff</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
index 5e7b2d3..cb925c1 100644
--- a/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
+++ b/EdkNt32Pkg/RuntimeDxe/FvbServices/Nt32Fwh.msa
@@ -1,89 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>FwBlockService</BaseName>
+    <ModuleName>FwBlockService</ModuleName>
     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>
-    <ComponentType>RT_DRIVER</ComponentType>
-    <Guid>BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9</Guid>
-    <Version>0</Version>
+    <GuidValue>BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for DiskIo module.</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>FwBlockService</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DxeServicesTableLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DxeRuntimeDriverLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDriverEntryPoint</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DxeServicesTableLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DxeRuntimeDriverLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiBootServicesTableLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Nt32Fwh.dxs</Filename>
-    <Arch ArchType="IA32">
-      <Filename>nt32\FwBlockService.c</Filename>
-      <Filename>nt32\FwBlockService.h</Filename>
-      <Filename>nt32\FvbInfo.c</Filename>
-    </Arch>
+    <Filename SupArchList="IA32">nt32\FwBlockService.c</Filename>
+    <Filename SupArchList="IA32">nt32\FwBlockService.h</Filename>
+    <Filename SupArchList="IA32">nt32\FvbInfo.c</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <Protocols>
-    <Protocol Usage="SOMETIMES_PRODUCED">DevicePath</Protocol>
-    <Protocol Usage="SOMETIMES_PRODUCED">FirmwareVolumeBlock</Protocol>
-    <Protocol Usage="ALWAYS_PRODUCED">FvbExtension</Protocol>
+    <Protocol Usage="SOMETIMES_PRODUCED">
+      <ProtocolCName>DevicePath</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_PRODUCED">
+      <ProtocolCName>FirmwareVolumeBlock</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_PRODUCED">
+      <ProtocolCName>FvbExtension</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Events>
     <CreateEvents>
-      <Event Usage="ALWAYS_CONSUMED" EventGroup="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE">
-        <C_Name>gEfiEventVirtualAddressChangeGuid</C_Name>
-        <Guid>0x13fa7698, 0xc831, 0x49c7, 0x87, 0xea, 0x8f, 0x43, 0xfc, 0xc2, 0x51, 0x96</Guid>
-      </Event>
+      <EventTypes EventGuidCName="gEfiEventVirtualAddressChangeGuid" Usage="ALWAYS_CONSUMED">
+        <EventType>EVENT_GROUP_GUID</EventType>
+      </EventTypes>
     </CreateEvents>
   </Events>
-  <Hobs>
-    <Hob Usage="ALWAYS_CONSUMED" HobType="FIRMWARE_VOLUME"></Hob>
-  </Hobs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_PRODUCED">
-      <C_Name>AlternateFvBlock</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_PRODUCED">
+      <GuidCName>AlternateFvBlock</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>FvbInitialize</ModuleEntryPoint>
     </Extern>
-    <Extern>
-      <SetVirtualAddressMapCallBack></SetVirtualAddressMapCallBack>
-      <ExitBootServicesCallBack></ExitBootServicesCallBack>
-    </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 73e74eb..fe463ec 100644
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -1,44 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
+<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <BaseName>SecMain</BaseName>
-    <ModuleType>SEC</ModuleType>
-    <ComponentType>SEC</ComponentType>
-    <Guid>4b837b03-6587-4d19-b82b-edfad836c0a0</Guid>
-    <Version>0</Version>
+    <ModuleName>SecMain</ModuleName>
+    <ModuleType>USER_DEFINED</ModuleType>
+    <GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for NT32 Sec.Warning the [sources.*] does not work like you think!If you add a file you need to update the makefile in the NT32 build tipSEC_OBJECTS needs to get the OBJ of the new C file added in.We keep [sources.*] synced up with SEC_OBJECTS so dependencies workproperly.Libraries.Common does not work you must update SEC_OBJECTS in the platformmakefile</Abstract>
     <Description>FIX ME!</Description>
     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Created>2006-03-14 17:04</Created>
-    <Updated>2006-03-19 15:17</Updated>
-    <Specification>0</Specification>
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>SecMain</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeCoffLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeCoffLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PrintLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>ReportStatusCodeLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PcdLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>SecMain.c</Filename>
@@ -46,40 +58,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>WinNtThunk.c</Filename>
     <Filename>SecMain.h</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-    <PackageName>EdkNt32Pkg</PackageName>
-  </Includes>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
+  </PackageDependencies>
   <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">NtThunk</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">NtAutoScan</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">NtFwh</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">StatusCode</Ppi>
-    <Ppi Usage="ALWAYS_PRODUCED">NtPeiLoadFile</Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>NtThunk</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>NtAutoScan</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>NtFwh</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>StatusCode</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>NtPeiLoadFile</PpiCName>
+    </Ppi>
   </PPIs>
   <Guids>
-    <GuidEntry Usage="ALWAYS_PRODUCED">
-      <C_Name>PeiPeCoffLoader</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="ALWAYS_PRODUCED">
+      <GuidCName>PeiPeCoffLoader</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
-    <Extern>
-      <ModuleEntryPoint></ModuleEntryPoint>
-    </Extern>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
   </Externs>
   <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtMemorySizeForSecMain</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtFirmwareVolume</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtFirmwareVolume</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
     <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdWinNtBootMode</C_Name>
+      <TokenSpaceGuidCName>FIX_ME_PcdWinNtBootMode</TokenSpaceGuidCName>
+      <HelpText/>
     </PcdEntry>
   </PcdCoded>
-  <BuildOptions>
-    <Option>BUILD_TYPE=CUSTOM_BUILD</Option>
-  </BuildOptions>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index b0436d3..f318869 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -24,53 +24,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- Compile all dependency Library instances. --> 
 
   <target name="libraries">
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseLib\build.xml" inheritAll="false" target="BaseLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseMemoryLib\build.xml" inheritAll="false" target="BaseMemoryLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePrintLib\build.xml" inheritAll="false" target="BasePrintLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePeCoffLib\build.xml" inheritAll="false" target="BasePeCoffLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseReportStatusCodeLibNull\build.xml" inheritAll="false" target="BaseReportStatusCodeLibNull">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseDebugLibNull\build.xml" inheritAll="false" target="BaseDebugLibNull">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <Expand />
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="27d67720-ea68-48ae-93da-a3a074c90e30"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="fd44e603-002a-4b29-9f5f-529e815b6165"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="556f5d10-7309-4af4-b80a-8196bd60946f"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="55c61087-7367-4546-bc32-4937c5e6aff3"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="9ba1d976-0624-41a3-8650-28165e8d9ae8"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
   </target>
   <target name="sourcefiles">
-      <Build_AUTOGEN FILENAME="AutoGen" FILEPATH=".">
+      <Build_AUTOGEN FILEEXT="c" FILENAME="AutoGen" FILEPATH=".">
          <EXTRA.INC>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
@@ -80,8 +88,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${DEST_DIR_DEBUG}"/>
          </EXTRA.INC>
        </Build_AUTOGEN>
-      <Build_C_Code FILENAME="FwVol" FILEPATH=".">
+       <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.obj" />
+      <Build_CCode FILEEXT="c" FILENAME="FwVol" FILEPATH=".">
          <EXTRA.INC>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
@@ -90,9 +102,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
             <includepath path="${DEST_DIR_DEBUG}"/>
          </EXTRA.INC>
-      </Build_C_Code>
-      <Build_C_Code FILENAME="WinNtThunk" FILEPATH=".">
+      </Build_CCode>
+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/FwVol.obj" />
+      <Build_CCode FILEEXT="c" FILENAME="WinNtThunk" FILEPATH=".">
          <EXTRA.INC>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
@@ -101,9 +117,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
             <includepath path="${DEST_DIR_DEBUG}"/>
          </EXTRA.INC>
-      </Build_C_Code>
-      <Build_C_Code FILENAME="SecMain" FILEPATH=".">
+      </Build_CCode>
+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/WinNtThunk.obj" />
+      <Build_CCode FILEEXT="c" FILENAME="SecMain" FILEPATH=".">
          <EXTRA.INC>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
             <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
             <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
@@ -112,12 +132,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
             <includepath path="${DEST_DIR_DEBUG}"/>
          </EXTRA.INC>
-      </Build_C_Code>
+      </Build_CCode>
+      <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/SecMain.obj" />
     </target>
     <target name="sections" />
     <target name="output" >
-      <echo message="##Entering Output!" />
-      
       <OnDependency>
         <sourcefiles>
           <file list="${OBJECTS}"/>
@@ -128,10 +147,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
         
         <sequential>
-          <shellscript shell="cmd.exe" tmpsuffix=".cmd">
+          <shellscript shell="cmd.exe" tmpsuffix=".cmd" >
             <arg line="/c"/>
             <arg line="call"/>
-            "${LINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
           </shellscript>
         </sequential>
       </OnDependency>
author	wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524>	2006-06-30 17:51:10 +0000
committer	wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524>	2006-06-30 17:51:10 +0000
commit	2d52720093851dcc3f0ffd30ac9854cc775300a9 (patch)
tree	ab59c88c5d16c91459c80881474c037f92f6d238 /EdkNt32Pkg
parent	5d558ad8cf04e3109ea214850a777c60179e0646 (diff)
download	edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.zip edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.tar.gz edk2-2d52720093851dcc3f0ffd30ac9854cc775300a9.tar.bz2