1 files changed, 120 insertions, 105 deletions
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index ade4d013a6..65c991f913 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -1,129 +1,144 @@
 <?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>DxeIpl</BaseName>
+    <ModuleName>DxeIpl</ModuleName>
     <ModuleType>PEIM</ModuleType>
-    <ComponentType>PE32_PEIM</ComponentType>
-    <Guid>86D70125-BAA3-4296-A62F-602BEBBB9081</Guid>
-    <Version>EDK_RELEASE_VERSION        0x00020000</Version>
+    <GuidValue>86D70125-BAA3-4296-A62F-602BEBBB9081</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-12 17:09</Created>
-    <Updated>2006-03-22 18:54</Updated>
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</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>DxeIpl</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">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PerformanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">ReportStatusCodeLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">CacheMaintenanceLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">EdkPeCoffLoaderLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">TianoDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">CustomDecompressLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</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>HobLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PerformanceLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>ReportStatusCodeLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>CacheMaintenanceLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>EdkPeCoffLoaderLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiDecompressLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>TianoDecompressLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>CustomDecompressLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiServicesTablePointerLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>DxeLoad.c</Filename>
     <Filename>DxeIpl.dxs</Filename>
-    <Arch ArchType="IA32">
-      <Filename>Ia32/ImageRead.c</Filename>
-      <Filename>Ia32/DxeLoadFunc.c</Filename>
-    </Arch>
-    <Arch ArchType="X64">
-      <Filename>Ia32/ImageRead.c</Filename>
-      <Filename>Ia32/DxeLoadFunc.c</Filename>
-    </Arch>
-    <Arch ArchType="IPF">
-      <Filename>ipf/ImageRead.c</Filename>
-      <Filename>ipf/DxeLoadFunc.c</Filename>
-    </Arch>
-    <Arch ArchType="EBC">
-      <Filename>Ia32/ImageRead.c</Filename>
-      <Filename>Ia32/DxeLoadFunc.c</Filename>
-    </Arch>
+    <Filename SupArchList="IA32">Ia32/ImageRead.c</Filename>
+    <Filename SupArchList="IA32">Ia32/DxeLoadFunc.c</Filename>
+    <Filename SupArchList="X64">Ia32/ImageRead.c</Filename>
+    <Filename SupArchList="X64">Ia32/DxeLoadFunc.c</Filename>
+    <Filename SupArchList="IPF">ipf/ImageRead.c</Filename>
+    <Filename SupArchList="IPF">ipf/DxeLoadFunc.c</Filename>
+    <Filename SupArchList="EBC">Ia32/ImageRead.c</Filename>
+    <Filename SupArchList="EBC">Ia32/DxeLoadFunc.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="SOMETIMES_PRODUCED">Decompress</Protocol>
-    <Protocol Usage="SOMETIMES_PRODUCED">TianoDecompress</Protocol>
-    <Protocol Usage="SOMETIMES_PRODUCED">CustomizedDecompress</Protocol>
+    <Protocol Usage="SOMETIMES_PRODUCED">
+      <ProtocolCName>Decompress</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_PRODUCED">
+      <ProtocolCName>TianoDecompress</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="SOMETIMES_PRODUCED">
+      <ProtocolCName>CustomizedDecompress</ProtocolCName>
+    </Protocol>
   </Protocols>
-  <Hobs>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">
-      <C_Name>gEfiHobMemoryAllocBspStoreGuid</C_Name>
-      <Guid>0x564b33cd, 0xc92a, 0x4593, 0x90, 0xbf, 0x24, 0x73, 0xe4, 0x3c, 0x63, 0x22</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiDecompressProtocolGuid</C_Name>
-      <Guid>0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiTianoDecompressProtocolGuid</C_Name>
-      <Guid>0xe84cf29c, 0x191f, 0x4eae, 0x96, 0xe1, 0xf4, 0x6a, 0xec, 0xea, 0xea, 0x0b</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiCustomizedDecompressProtocolGuid</C_Name>
-      <Guid>0x9a44198e, 0xa4a2, 0x44e6, 0x8a, 0x1f, 0x39, 0xbe, 0xfd, 0xac, 0x89, 0x6f</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gEfiPeiPeCoffLoaderGuid</C_Name>
-      <Guid>0xd8117cff, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="MEMORY_ALLOCATION">
-      <C_Name>gEfiHobMemoryAllocModuleGuid</C_Name>
-      <Guid>0xf8e21975, 0x0899, 0x4f58, 0xa4, 0xbe, 0x55, 0x25, 0xa9, 0xc6, 0xd7, 0x7a</Guid>
-    </Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="FIRMWARE_VOLUME">
-      <Name>DecompressedFvmain.fv</Name>
-    </Hob>
-  </Hobs>
   <PPIs>
-    <Ppi Usage="SOMETIMES_PRODUCED">DxeIpl</Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">FvFileLoader</Ppi>
-    <Ppi Usage="SOMETIMES_PRODUCED">EndOfPeiSignal</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">RecoveryModule</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">S3Resume</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">SectionExtraction</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">Security</Ppi>
-    <Ppi Usage="PRIVATE">PeiInMemory</Ppi>
+    <Ppi Usage="SOMETIMES_PRODUCED">
+      <PpiCName>DxeIpl</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_PRODUCED">
+      <PpiCName>FvFileLoader</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_PRODUCED">
+      <PpiCName>EndOfPeiSignal</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>RecoveryModule</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>S3Resume</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>SectionExtraction</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>Security</PpiCName>
+    </Ppi>
+    <Ppi Usage="PRIVATE">
+      <PpiCName>PeiInMemory</PpiCName>
+    </Ppi>
   </PPIs>
   <Guids>
-    <GuidEntry Usage="SOMETIMES_CONSUMED">
-      <C_Name>PeiPeCoffLoader</C_Name>
-    </GuidEntry>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
+      <GuidCName>PeiPeCoffLoader</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeimInitializeDxeIpl</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file