Merge R8->R9 tracker 5935 and 7080 to update runtime arch protocol to DxeCis 0.91...

[mirror_edk2.git] / EdkModulePkg / Universal / Runtime / RuntimeDxe / Runtime.msa

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 136d6dcd84c89f0c85af3d2cc54836f866a7915e..619c0980df891bb81652e9776f765b70d54c9dbb 100644 (file)
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, Intel Corporation\r
-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
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->\r
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>Runtime</ModuleName>\r
     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>\r
     <GuidValue>B601F8C4-43B7-4784-95B1-F4226CB40CEE</GuidValue>\r
     <Version>1.0</Version>\r
-    <Abstract>Component description file for DiskIo module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
+    <Abstract>Component description file for Runtime module.</Abstract>\r
+    <Description>This module is used to produce the EFI runtime virtual switch over.</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
@@ -34,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>DxeRuntimeDriverLib</Keyword>\r
+      <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
@@ -57,31 +49,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>CacheMaintenanceLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PeCoffLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>Runtime.dxs</Filename>\r
-    <Filename>PeHotRelocate.c</Filename>\r
     <Filename>Runtime.c</Filename>\r
     <Filename>Runtime.h</Filename>\r
     <Filename>Crc32.c</Filename>\r
-    <Filename SupArchList="IA32">Ia32/PeHotRelocateEx.c</Filename>\r
-    <Filename SupArchList="X64">x64/PeHotRelocateEx.c</Filename>\r
-    <Filename SupArchList="X64">x64/PeHotRelocateEx.h</Filename>\r
-    <Filename SupArchList="IPF">Ipf/PeHotRelocateEx.c</Filename>\r
-    <Filename SupArchList="IPF">Ipf/PeHotRelocateEx.h</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>LoadedImage</ProtocolCName>\r
+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>Runtime</ProtocolCName>\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiUgaIoProtocolGuid</ProtocolCName>\r
+    </Protocol> \r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiRuntimeArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <Guids>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
+      <GuidCName>gEfiCapsuleGuid</GuidCName>\r
+    </GuidCNames>\r
+  </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r