clean up msa files in EdkModulePkg, removed unnecessary library definitions and PCDs.

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

3 files changed, 23 insertions, 142 deletions

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
index 98c7e9c35a..6bb518a1db 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa
@@ -1,5 +1,5 @@
 <?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>PeiVariable</ModuleName>

     <ModuleType>PEIM</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>Framework PEIM to provide the Variable functionality.</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

@@ -32,14 +32,11 @@
       <Keyword>PeimEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>HobLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

-    </LibraryClass>    

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>Variable.h</Filename>

@@ -56,9 +53,6 @@
   </PackageDependencies>

   <PPIs>

     <Ppi Usage="ALWAYS_CONSUMED">

-      <PpiCName>gPeiFlashMapPpiGuid</PpiCName>

-    </Ppi>

-    <Ppi Usage="ALWAYS_CONSUMED">

       <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>

     </Ppi>

   </PPIs>

@@ -73,10 +67,8 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        The driver gets the Variable store base address from this PCD.  This base address point to

-        an EFI_FIRMWARE_VOLUMN_HEADER struct.

-      </HelpText>

-    </PcdEntry>     

-  </PcdCoded> 

+      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to

+        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 5bfc17faa9..50a53ed19e 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -1,5 +1,5 @@
 <?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>Variable</ModuleName>

     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.</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

@@ -24,12 +24,6 @@
   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

-    </LibraryClass>  

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</Keyword>

@@ -44,9 +38,6 @@
       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>HobLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -69,24 +60,6 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

-    </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

     </Protocol>

@@ -97,29 +70,9 @@
       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>

-    </GuidCNames>

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

-      <GuidCName>Hob</GuidCName>

-    </GuidCNames>-->

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

-      <GuidCName>SystemNvData</GuidCName>

-    </GuidCNames>-->

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiAlternateFvBlockGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

@@ -134,17 +87,13 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        The driver gets the Variable store base address from this PCD.  This base address point to

-        an EFI_FIRMWARE_VOLUMN_HEADER struct.

-      </HelpText>

-    </PcdEntry>      

+      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to

+        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>

+    </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        The driver gets the NvStorage Variable Size from this PCD.

-      </HelpText>      

-    </PcdEntry>     

-  </PcdCoded>  

+      <HelpText>The driver gets the NvStorage Variable Size from this PCD.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
index 37390d6038..68c51c07ce 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
@@ -1,5 +1,5 @@
 <?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>VariableIpf</ModuleName>

     <ModuleType>DXE_SAL_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.</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

@@ -24,12 +24,6 @@
   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

-    </LibraryClass>  

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</Keyword>

@@ -44,9 +38,6 @@
       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>HobLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -72,63 +63,16 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

-    </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>

-    </GuidCNames>

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

-      <GuidCName>Hob</GuidCName>

-    </GuidCNames>-->

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

-      <GuidCName>SystemNvData</GuidCName>

-    </GuidCNames>-->

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiAlternateFvBlockGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

@@ -143,17 +87,13 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableBase</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        The driver gets the Variable store base address from this PCD.  This base address point to

-        an EFI_FIRMWARE_VOLUMN_HEADER struct.

-      </HelpText>

-    </PcdEntry>      

+      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to

+        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>

+    </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        The driver gets the NvStorage Variable Size from this PCD.

-      </HelpText>      

-    </PcdEntry>     

-  </PcdCoded>  

+      <HelpText>The driver gets the NvStorage Variable Size from this PCD.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file