1 files changed, 12 insertions, 17 deletions
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 44dfacc5da..207b44c4d9 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -6,8 +6,8 @@
     <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for Runtime module.</Abstract>
-    <Description>This module is used to produce the EFI runtime virtual switch over.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This module is used to produce the EFI runtime virtual switch over services.</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
@@ -26,13 +26,11 @@
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>UefiRuntimeLib</Keyword>
-    </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>ReportStatusCodeLib</Keyword>
@@ -40,9 +38,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">
-      <Keyword>EdkDxeSalLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiRuntimeServicesTableLib</Keyword>
     </LibraryClass>
@@ -70,18 +65,18 @@
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="SOMETIMES_CONSUMED">
-      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>
-    </Protocol> 
     <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Guids>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiCapsuleGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
+  <SystemTables>
+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">
+      <SystemTableCName>gEfiUgaIoProtocolGuid</SystemTableCName>
+    </SystemTableCNames>
+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">
+      <SystemTableCName>gEfiCapsuleGuid</SystemTableCName>
+    </SystemTableCNames>
+  </SystemTables>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>