Modify DSC file according to update of MDE library instances.

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

1 files changed, 12 insertions, 14 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index fc876ce495..dc0499e002 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -29,7 +29,7 @@
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

-  CpuLib|MdePkg/Library/CpuLib/CpuLib.inf

+  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

@@ -60,9 +60,9 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  FvbServiceLib|MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf

+  FvbServiceLib|MdePkg/Library/FvbServiceLib/FvbServiceLib.inf

   ScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-  HiiLib|MdePkg/Library/HiiLib/HiiLib.inf

+  HiiLib|MdePkg/Library/UefiHiiLib/UefiHiiLib.inf

   ExtendedHiiLib|MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf

   UsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

@@ -70,14 +70,14 @@
   UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  GraphicsLib|MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf

-  IfrSupportLib|MdePkg/Library/IfrSupportLib/IfrSupportLib.inf

+  GraphicsLib|MdePkg/Library/GraphicsLib/GraphicsLib.inf

+  IfrSupportLib|MdePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf

   ExtendedIfrSupportLib|MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   DxePiLib|MdePkg/Library/DxePiLib/DxePiLib.inf

   PlatformBdsLib|MdeModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf

   GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

-  GraphicsLib|MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf

+  GraphicsLib|MdePkg/Library/GraphicsLib/GraphicsLib.inf

   DxePiLib|MdePkg/Library/DxePiLib/DxePiLib.inf

   PlatformBdsLib|MdeModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf

   GenericBdsLib|MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

@@ -119,37 +119,37 @@
 

 [LibraryClasses.common.DXE_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

 

 [LibraryClasses.common.DXE_RUNTIME_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

 

 [LibraryClasses.common.DXE_SAL_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

 

 [LibraryClasses.common.DXE_SMM_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

 

 [LibraryClasses.common.UEFI_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

 

 [LibraryClasses.common.UEFI_APPLICATION]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf

 

 [PcdsFeatureFlag.common]

@@ -276,7 +276,6 @@
   MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

 

   MdeModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

-  MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf

   MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf

   MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf

 

@@ -350,7 +349,6 @@
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

   MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf

   MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf

-  MdeModulePkg/Library/GraphicsLib/GraphicsLib.inf

   MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

 [Components.X64]