1 files changed, 85 insertions, 60 deletions
diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index 43c29de349..051242ff5d 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -1,47 +1,65 @@
 <?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>PeiMain</BaseName>
+    <ModuleName>PeiMain</ModuleName>
     <ModuleType>PEI_CORE</ModuleType>
-    <ComponentType>PEI_CORE</ComponentType>
-    <Guid>52C05B14-0B98-496c-BC3B-04B50211D680</Guid>
-    <Version>0</Version>
+    <GuidValue>52C05B14-0B98-496c-BC3B-04B50211D680</GuidValue>
+    <Version>1.0</Version>
     <Abstract>Component description file for PeiMain 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-19 15:18</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>PeiMain</OutputFileBasename>
+  </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreEntryPoint</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">PeCoffGetEntryPointLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">TimerLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>DebugLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>PeiCoreEntryPoint</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>PeCoffGetEntryPointLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseMemoryLib</Keyword>
+    </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>TimerLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>PeiMain.h</Filename>
@@ -57,35 +75,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Reset/Reset.c</Filename>
     <Filename>Security/Security.c</Filename>
     <Filename>StatusCode/StatusCode.c</Filename>
-    <Arch ArchType="IPF">
-      <Filename>ipf/SwitchToCacheMode.c</Filename>
-      <Filename>ipf/IpfCpuCore.i</Filename>
-      <Filename>ipf/IpfCpuCore.s</Filename>
-    </Arch>
+    <Filename SupArchList="IPF">ipf/SwitchToCacheMode.c</Filename>
+    <Filename SupArchList="IPF">ipf/IpfCpuCore.i</Filename>
+    <Filename SupArchList="IPF">ipf/IpfCpuCore.s</Filename>
   </SourceFiles>
-  <Includes>
-    <PackageName>MdePkg</PackageName>
-    <PackageName>EdkModulePkg</PackageName>
-  </Includes>
-  <Hobs>
-    <Hob Usage="ALWAYS_PRODUCED" HobType="PHIT"></Hob>
-    <Hob Usage="SOMETIMES_PRODUCED" HobType="GUID_EXTENSION">
-      <C_Name>gPeiPerformanceHobGuid</C_Name>
-      <Guid>0xec4df5af, 0x4395, 0x4cc9, 0x94, 0xde, 0x77, 0x50, 0x6d, 0x12, 0xc7, 0xb8</Guid>
-    </Hob>
-  </Hobs>
+  <PackageDependencies>
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+  </PackageDependencies>
   <PPIs>
-    <Ppi Usage="ALWAYS_PRODUCED">MemoryDiscovered</Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">FindFv</Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">FvFileLoader</Ppi>
-    <Ppi Usage="ALWAYS_CONSUMED">DxeIpl</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">Reset</Ppi>
-    <Ppi Usage="SOMETIMES_CONSUMED">StatusCode</Ppi>
-    <PpiNotify Usage="SOMETIMES_CONSUMED">Security</PpiNotify>
+    <Ppi Usage="ALWAYS_PRODUCED">
+      <PpiCName>MemoryDiscovered</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>FindFv</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>FvFileLoader</PpiCName>
+    </Ppi>
+    <Ppi Usage="ALWAYS_CONSUMED">
+      <PpiCName>DxeIpl</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>Reset</PpiCName>
+    </Ppi>
+    <Ppi Usage="SOMETIMES_CONSUMED">
+      <PpiCName>StatusCode</PpiCName>
+    </Ppi>
+    <PpiNotify Usage="SOMETIMES_CONSUMED">
+      <PpiNotifyCName>Security</PpiNotifyCName>
+    </PpiNotify>
   </PPIs>
   <Externs>
+    <Specification>EFI_SPECIFICATION_VERSION 0x00000000</Specification>
+    <Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
     <Extern>
       <ModuleEntryPoint>PeiCore</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
+\ No newline at end of file