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

13 files changed, 53 insertions, 109 deletions

diff --git a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa b/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
index 47e06bb..f224cab 100644
--- a/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa
+++ b/EdkModulePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.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>BaseCustomDecompressLibNull</ModuleName>

     <ModuleType>BASE</ModuleType>

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

     <Abstract>Base Custom Decompression Library</Abstract>

     <Description>Customer Decompress Library with NULL implementation.</Description>

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

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

@@ -25,9 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED">

       <Keyword>CustomDecompressLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>BaseCustomDecompressLibNull.c</Filename>

diff --git a/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa b/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
index 2274f0e..ddfb3ec 100644
--- a/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
+++ b/EdkModulePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Debug Library for UEFI drivers</Abstract>

     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</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
@@ -22,13 +22,13 @@
     <OutputFileBasename>UefiDebugLibConOut</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

     <LibraryClass Usage="ALWAYS_PRODUCED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PrintLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
index ac8b811..3555a24 100644
--- a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
+++ b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for Dxe Performance Library</Abstract>

     <Description>This library provides intrastructure for Dxe driver to log performance.</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,9 +32,6 @@
       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>TimerLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

diff --git a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa b/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
index 26c4018..d302a8b 100644
--- a/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
+++ b/EdkModulePkg/Library/EdkDxePrintLib/EdkDxePrintLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>DXE Print library</Abstract>

     <Description>Print Library based on EFI_PRINT_PROTOCOL</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
@@ -26,9 +26,6 @@
       <Keyword>PrintLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
index 36b9b00..24a56a2 100644
--- a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>SAL library for BS/RT drivers</Abstract>

     <Description>Contains APIs to register/invoke SAL functions.</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
@@ -26,12 +26,6 @@
       <Keyword>EdkDxeSalLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
index 39d6b4f..3b55b13 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>SAL library for BS/RT drivers</Abstract>

     <Description>Contains APIs to register/invoke SAL functions.</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
@@ -26,12 +26,6 @@
       <Keyword>EdkDxeSalLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index 020abc3..2aa7abb 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>FvbService Library for UEFI drivers</Abstract>

     <Description>This library instance provide sevice functions to access Firmware Volume Block protocol.</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
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>EdkFvbServiceLib</OutputFileBasename>

   </ModuleDefinitions>

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

       <Keyword>EdkFvbServiceLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PrintLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>BaseLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>UefiRuntimeLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">

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

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

       <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

     </Protocol>

     <ProtocolNotify Usage="SOMETIMES_CONSUMED">

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
index 5db037d..aafed23 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
+++ b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Graphics Library for UEFI drivers</Abstract>

     <Description>This library provides supports for basic graphic functions.</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
@@ -26,9 +26,6 @@
       <Keyword>EdkGraphicsLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PrintLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

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

       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>

     </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa b/EdkModulePkg/Library/EdkIfrSupportLib/EdkIfrSupportLib.msa
index 7d3021c..87f4f74 100644
--- 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>

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

-    <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
@@ -27,15 +27,9 @@
       <Keyword>EdkIfrSupportLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PrintLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa b/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa
index 49d7c70..40e4561 100644
--- a/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa
+++ b/EdkModulePkg/Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.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>EdkOemHookStatusCodeLibNull</ModuleName>

     <ModuleType>PEIM</ModuleType>

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

     <Abstract>Memory Status Code Library for UEFI drivers</Abstract>

     <Description>Lib to provide memory journal status code reporting Routines</Description>

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

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

@@ -33,8 +33,6 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

-  <PPIs>

-  </PPIs>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index cb566c9..64f55e5 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Debug Library for UEFI drivers</Abstract>

     <Description>This library uses PrintLib to send messages to CONOUT.</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
@@ -53,11 +53,6 @@
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

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

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

-      <C_Name>PcdDebugClearMemoryValue</C_Name>

-      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>

-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>

-    </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>

     </PcdEntry>

+    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+      <C_Name>PcdDebugClearMemoryValue</C_Name>

+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>The value used by DebugClearMemory () to fill a certain range
+                of memory.</HelpText>

+    </PcdEntry>

   </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index ec25bd4..31399be 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Debug Library for UEFI drivers</Abstract>

     <Description>This library uses PrintLib to send messages to STDERR.</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
@@ -53,11 +53,6 @@
       <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

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

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

-      <C_Name>PcdDebugClearMemoryValue</C_Name>

-      <TokenSpaceGuidCName>FIX_ME_PcdDebugClearMemoryValue</TokenSpaceGuidCName>

-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>

-    </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>

     </PcdEntry>

+    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+      <C_Name>PcdDebugClearMemoryValue</C_Name>

+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>The value used by DebugClearMemory () to fill a certain range
+                of memory.</HelpText>

+    </PcdEntry>

   </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index f3be3cc..803a791 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Runtime driver library</Abstract>

     <Description>Instance of runtime driver library, Hook VitualAddressChange and 
       BooterviceExit event and provide runtime service.</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
@@ -27,12 +27,6 @@
       <Keyword>UefiRuntimeLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -55,13 +49,8 @@
   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

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

   </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>