1. Remove the dead code of DxeSalVirtualNotifyEvent() in DxeSalLib so that the depend...

2. Remove the support of DXE_DRIVER in EdkUefiRuntimeLib

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

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
index 1e27c1e54a2299371f44c6b36a9a9c5c67e8f4c8..39d6b4f090b68e1739a04dbd4553f6ac40431a50 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
@@ -34,9 +34,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiRuntimeLib</Keyword>\r
-    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename SupArchList="IPF">Ipf/EsalServiceLib.c</Filename>\r

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 2b4d2972213d6e8562cbc9ffa001605979609c04..98a401efda318d43b72031001726bafc6b03783b 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -59,37 +59,6 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
-VOID\r
-EFIAPI\r
-DxeSalVirtualNotifyEvent (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Fixup virtual address pointer of label.\r
-\r
-Arguments:\r
-\r
-  Event   - The Event that is being processed\r
-\r
-  Context - Event Context\r
-\r
-Returns:\r
-\r
-  None\r
-\r
---*/\r
-{\r
-  EfiConvertPointer (0x0, (VOID **) &mPlabel.EntryPoint);\r
-  EfiConvertPointer (EFI_IPF_GP_POINTER, (VOID **) &mPlabel.GP);\r
-\r
-  SetEsalVirtualEntryPoint (mPlabel.EntryPoint, mPlabel.GP);\r
-}\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 RegisterEsalFunction (\r

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index a3c9fc0f512506ca0af96c9ca4a6bbede77795d4..9dc11760efffe21765f7c36bcc2e0901697a0135 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -23,7 +23,7 @@
     <OutputFileBasename>EdkUefiRuntimeLib</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
+    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">\r
       <Keyword>UefiRuntimeLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r