1. Remove the dead code of DxeSalVirtualNotifyEvent() in DxeSalLib so that the dependency of UefiRuntimeLib can be removed.

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

3 files changed, 1 insertions, 35 deletions

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
index 1e27c1e54a..39d6b4f090 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
@@ -34,9 +34,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename SupArchList="IPF">Ipf/EsalServiceLib.c</Filename>

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 2b4d297221..98a401efda 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -59,37 +59,6 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;

 }

 

-STATIC

-VOID

-EFIAPI

-DxeSalVirtualNotifyEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  )

-/*++

-

-Routine Description:

-

-  Fixup virtual address pointer of label.

-

-Arguments:

-

-  Event   - The Event that is being processed

-

-  Context - Event Context

-

-Returns:

-

-  None

-

---*/

-{

-  EfiConvertPointer (0x0, (VOID **) &mPlabel.EntryPoint);

-  EfiConvertPointer (EFI_IPF_GP_POINTER, (VOID **) &mPlabel.GP);

-

-  SetEsalVirtualEntryPoint (mPlabel.EntryPoint, mPlabel.GP);

-}

-

 EFI_STATUS

 EFIAPI

 RegisterEsalFunction (

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index a3c9fc0f51..9dc11760ef 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -23,7 +23,7 @@
     <OutputFileBasename>EdkUefiRuntimeLib</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">

+    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_RUNTIME_DRIVER DXE_SAL_DRIVER">

       <Keyword>UefiRuntimeLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">