Clean up Lib MSAs for EdkModulePkg

1. Remove unnecessary library class
2. Remove unreferenced GUID

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

diff --git a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa b/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
index 47e06bb03242a802ba9b86767ef9bfb53b336f39..f224cab515e8f41f57bc4fdc3e44be393b2ce91d 100644 (file)
--- a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
+++ b/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

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

   <MsaHeader>\r
     <ModuleName>BaseCustomDecompressLibNull</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>BaseCustomDecompressLibNull</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r


@@ -7,12 +7,12 @@
     <Version>1.0</Version>\r
     <Abstract>Base Custom Decompression Library</Abstract>\r
     <Description>Customer Decompress Library with NULL implementation.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Base Custom Decompression Library</Abstract>\r
     <Description>Customer Decompress Library with NULL implementation.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
-      http://opensource.org/licenses/bsd-license.php\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
+    <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>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -25,9 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED">\r
       <Keyword>CustomDecompressLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED">\r
       <Keyword>CustomDecompressLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BaseCustomDecompressLibNull.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BaseCustomDecompressLibNull.c</Filename>\r

diff --git a/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa b/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
index 2274f0e44c84022e80629dbac4dbee31c075f6a8..ddfb3ec506573132a37e58be3308ac6fe55264d4 100644 (file)
--- a/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
+++ b/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -22,12 +22,12 @@
     <OutputFileBasename>UefiDebugLibConOut</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
     <OutputFileBasename>UefiDebugLibConOut</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_PRODUCED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
index ac8b811495049a1ee2822d4af6aaf61028e18063..3555a24da0614cf3c59e7f7d99c14e1cb3dae46e 100644 (file)
--- a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
+++ b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Dxe Performance Library</Abstract>\r
     <Description>This library provides intrastructure for Dxe driver to log performance.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Dxe Performance Library</Abstract>\r
     <Description>This library provides intrastructure for Dxe driver to log performance.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <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
     <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


@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>TimerLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa b/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
index 26c4018755d204aa4def4cd592ff3a67b292af9e..d302a8bae691a5fe6cc5bc6b64d2cf24193fcad9 100644 (file)
--- a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
+++ b/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>DXE Print library</Abstract>\r
     <Description>Print Library based on EFI_PRINT_PROTOCOL</Description>\r
     <Version>1.0</Version>\r
     <Abstract>DXE Print library</Abstract>\r
     <Description>Print Library based on EFI_PRINT_PROTOCOL</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -25,9 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
index 36b9b00e576e8e1269f2635655e8e0fcd864e7fc..24a56a2155b8826b4bc1c5c0e900927b63f2e8d1 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>SAL library for BS/RT drivers</Abstract>\r
     <Description>Contains APIs to register/invoke SAL functions.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>SAL library for BS/RT drivers</Abstract>\r
     <Description>Contains APIs to register/invoke SAL functions.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -25,12 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
       <Keyword>EdkDxeSalLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
       <Keyword>EdkDxeSalLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
index 39d6b4f090b68e1739a04dbd4553f6ac40431a50..3b55b13a069a3ea9ed6cdf203f1e022143744d44 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>SAL library for BS/RT drivers</Abstract>\r
     <Description>Contains APIs to register/invoke SAL functions.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>SAL library for BS/RT drivers</Abstract>\r
     <Description>Contains APIs to register/invoke SAL functions.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -25,12 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkDxeSalLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkDxeSalLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index 020abc3c049c6a1c1b7d627e3f6d7c87b7ce4675..2aa7abb34dc53b8989cb3192b09482e112a03acc 100644 (file)
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>FvbService Library for UEFI drivers</Abstract>\r
     <Description>This library instance provide sevice functions to access Firmware Volume Block protocol.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>FvbService Library for UEFI drivers</Abstract>\r
     <Description>This library instance provide sevice functions to access Firmware Volume Block protocol.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <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
     <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


@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>\r

     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>EdkFvbServiceLib</OutputFileBasename>\r
   </ModuleDefinitions>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>EdkFvbServiceLib</OutputFileBasename>\r
   </ModuleDefinitions>\r


@@ -25,28 +25,22 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkFvbServiceLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkFvbServiceLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r


@@ -64,10 +58,10 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">\r
       <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <ProtocolNotify Usage="SOMETIMES_CONSUMED">\r

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
index 5db037d309f8db32f8c8db00c95f3299f8d7b47c..aafed235077e6b6f408897c59ccfb8e894a9d160 100644 (file)
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
+++ b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Graphics Library for UEFI drivers</Abstract>\r
     <Description>This library provides supports for basic graphic functions.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Graphics Library for UEFI drivers</Abstract>\r
     <Description>This library provides supports for basic graphic functions.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -25,9 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkGraphicsLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkGraphicsLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>PrintLib</Keyword>\r
     </LibraryClass>\r


@@ -67,6 +64,9 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r

diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa b/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa
index 7d3021c2010e2f1e25a5a60d97bd09695b000dd3..87f4f7411a4ffc097340abc35f4a166dc5f75781 100644 (file)
--- a/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa
+++ b/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa
@@ -8,7 +8,7 @@
     <Abstract>EDK Internal Form Refresentation Support Library Instance.</Abstract>\r
     <Description>The library instance provides common library routines help in 
     IFR creation on-the-fly, HII variable access, HII database access, multi language supports.</Description>\r
     <Abstract>EDK Internal Form Refresentation Support Library Instance.</Abstract>\r
     <Description>The library instance provides common library routines help in 
     IFR creation on-the-fly, HII variable access, HII database access, multi language supports.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -26,15 +26,9 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkIfrSupportLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
       <Keyword>EdkIfrSupportLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa b/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa
index 49d7c7036a1eba7502130b8a79151b248a69fc80..40e4561c5fb1e900e885c2a77bbce4eac0049364 100644 (file)
--- a/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa
+++ b/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

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

   <MsaHeader>\r
     <ModuleName>EdkOemHookStatusCodeLibNull</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r
   <MsaHeader>\r
     <ModuleName>EdkOemHookStatusCodeLibNull</ModuleName>\r
     <ModuleType>PEIM</ModuleType>\r


@@ -7,12 +7,12 @@
     <Version>1.0</Version>\r
     <Abstract>Memory Status Code Library for UEFI drivers</Abstract>\r
     <Description>Lib to provide memory journal status code reporting Routines</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Memory Status Code Library for UEFI drivers</Abstract>\r
     <Description>Lib to provide memory journal status code reporting Routines</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
-      http://opensource.org/licenses/bsd-license.php\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
+    <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>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r


@@ -33,8 +33,6 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r

-  <PPIs>\r
-  </PPIs>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index cb566c9d06b8e468dabf2a92d6de601038d98531..64f55e51ed4a1f516c73a31c4156a83ba4351970 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>This library uses PrintLib to send messages to CONOUT.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>This library uses PrintLib to send messages to CONOUT.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -53,11 +53,6 @@
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r


@@ -73,17 +68,17 @@
                 Assert, Debug Print, Debug Code, Clear Memory, Assert
                 Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r
                 Assert, Debug Print, Debug Code, Clear Memory, Assert
                 Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r

     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>The value used by DebugClearMemory () to fill a certain range
+                of memory.</HelpText>\r
+    </PcdEntry>\r

   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file
   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index ec25bd434e85482bd8a3cf3085f34bbbb7b658b8..31399be541da3e4500f48010dd3eeef3d1ba44f3 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>This library uses PrintLib to send messages to STDERR.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Debug Library for UEFI drivers</Abstract>\r
     <Description>This library uses PrintLib to send messages to STDERR.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -53,11 +53,6 @@
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r


@@ -73,17 +68,17 @@
                 Assert, Debug Print, Debug Code, Clear Memory, Assert
                 Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r
                 Assert, Debug Print, Debug Code, Clear Memory, Assert
                 Breakpoint and Assert Deadloop.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r

     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="DYNAMIC">\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>The value used by DebugClearMemory () to fill a certain range
+                of memory.</HelpText>\r
+    </PcdEntry>\r

   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file
   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index f3be3cc9add46b9abc67f99200e672d3f12b5466..803a791a4a7c1fd6f8b97afe49a0c22e485c808e 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Runtime driver library</Abstract>\r
     <Description>Instance of runtime driver library, Hook VitualAddressChange and 
       BooterviceExit event and provide runtime service.</Description>\r
     <Abstract>Runtime driver library</Abstract>\r
     <Description>Instance of runtime driver library, Hook VitualAddressChange and 
       BooterviceExit event and provide runtime service.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -26,12 +26,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r


@@ -55,13 +49,8 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" SupArchList="IPF"/>\r

   </PackageDependencies>\r
   </PackageDependencies>\r

-  <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r