Clean up MSA file of the checked in modules which include:

1) remove unused library class
2) remove unreferenced GUIDs


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

5 files changed, 35 insertions, 34 deletions

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index 55d2dba..1ed9c09 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>DxeMain</ModuleName>

     <ModuleType>DXE_CORE</ModuleType>

     <GuidValue>D6A2CB7F-6A18-4e2f-B43B-9920A733700A</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for DxeMain module.</Abstract>

-    <Description>This module provide an DXE CIS compliant implementation.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Description>This module provide an DXE CIS compliant implementation of DXE Core.</Description>

+    <Copyright>Copyright (c) 2006 - 2007, 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>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -104,7 +104,7 @@
     <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiEbcProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

@@ -113,16 +113,16 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiCpuArchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiFirmwareVolumeDispatchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiSectionExtractionProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="SOMETIMES_CONSUMED">

@@ -173,7 +173,7 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiLoadPeImageProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

@@ -188,6 +188,9 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiCapsuleArchProtocolGuid</ProtocolCName>

     </Protocol>

+    <Protocol Usage="SOMETIMES_CONSUMED">

+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

@@ -215,12 +218,6 @@
       <GuidCName>gEfiHobMemoryAllocModuleGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>

-    </GuidCNames>

-    <!--<GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>LoadPeImage</GuidCName>

-    </GuidCNames>-->

-    <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiEventExitBootServicesGuid</GuidCName>

     </GuidCNames>

     <GuidCNames Usage="ALWAYS_CONSUMED">

@@ -229,6 +226,12 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiEventMemoryMapChangeGuid</GuidCName>

     </GuidCNames>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiEventReadyToBootGuid</GuidCName>

+    </GuidCNames>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiEventLegacyBootGuid</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index fa11a87..c552966 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for DxeIpl module</Abstract>

     <Description>The responsibility of this module is to load the DXE Core from a Firmware Volume.  This implementation i used to load a 32-bit DXE Core.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -35,9 +35,6 @@
       <Keyword>HobLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PerformanceLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PeiServicesLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -70,6 +67,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PeCoffLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>DxeLoad.c</Filename>

@@ -134,7 +134,7 @@
     </Extern>

   </Externs>

   <PcdCoded>

-    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">

+    <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED" SupArchList="IA32">

       <C_Name>PcdDxeIplSwitchToLongMode</C_Name>

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DefaultValue>TRUE</DefaultValue>

diff --git a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index c764b39..4cf4452 100644
--- a/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/EdkModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -29,9 +29,6 @@ TransferOldDataToNewDataRange (
   IN PEI_CORE_INSTANCE        *PrivateData

   );

 

-EFI_GUID gEfiPeiCorePrivateGuid = EFI_PEI_CORE_PRIVATE_GUID;

-

-

 EFI_STATUS

 PeiDispatcher (

   IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,

@@ -529,6 +526,9 @@ Returns:
 

 --*/

 {

+  //

+  //Build private HOB to PEI core to transfer old NEM-range data to new NEM-range

+  //

   return BuildGuidDataHob (&gEfiPeiCorePrivateGuid, PrivateData, sizeof (PEI_CORE_INSTANCE));

 }

 

diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index 8aa9735..53c429f 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -24,12 +24,8 @@ Revision History
 #ifndef _PEI_MAIN_H_

 #define _PEI_MAIN_H_

 

-//

-//Build private HOB to PEI core to transfer old NEM-range data to new NEM-range

-//

-#define EFI_PEI_CORE_PRIVATE_GUID  \

-  {0xd641a0f5, 0xcb7c, 0x4846, { 0xa3, 0x80, 0x1d, 0x01, 0xb4, 0xd9, 0xe3, 0xb9 } }

- 

+extern EFI_GUID gEfiPeiCorePrivateGuid;

+

 //

 // Pei Core private data structures

 //

diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index 5daf40f..b8873a8 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for PeiMain module</Abstract>

     <Description>This module provide an DXE CIS compliant implementation.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Copyright>Copyright (c) 2006 - 2007, 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

@@ -52,9 +52,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>TimerLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="SOMETIMES_CONSUMED">

-      <Keyword>PeCoffLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>PeiMain.h</Filename>

@@ -105,6 +102,11 @@
       <PpiNotifyCName>gEfiPeiSecurityPpiGuid</PpiNotifyCName>

     </PpiNotify>

   </PPIs>

+  <Guids>

+    <GuidCNames Usage="PRIVATE">

+      <GuidCName>gEfiPeiCorePrivateGuid</GuidCName>

+    </GuidCNames>

+  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

@@ -112,4 +114,4 @@
       <ModuleEntryPoint>PeiCore</ModuleEntryPoint>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>