Clean up package/platform DSC files by the following steps:

  1. Remove PCDs those use the default values/types from the DEC file.
  2. Remove the unused library instances.
  3. Group common library instances in common [LibraryClasses] section as the default library instance for all modules.


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

1 files changed, 46 insertions, 99 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 6aba072de3..e17710febf 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -24,69 +24,65 @@
   SKUID_IDENTIFIER               = DEFAULT

 

 [LibraryClasses]

-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.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

-  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

-  PostCodeLib|MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf

-  PostCodeLib|MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf

-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

-

+  #

+  # Entry point

+  #

   PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

-  PalLib|MdePkg/Library/BasePalLibNull/BasePalLibNull.inf

+  #

+  # Basic

+  #

+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

+  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

+  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

+  #

+  # UEFI & PI

+  #

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

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

+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

+  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

+  #

+  # Generic Modules

+  #

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

+  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

   IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

   UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf

-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  #

+  # Misc

+  #

+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf  

+  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

+  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

 

-[LibraryClasses.IA32]

-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-

-[LibraryClasses.X64]

-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-

-[LibraryClasses.IPF]

-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-

-[LibraryClasses.ARM]

-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

-

 [LibraryClasses.EBC.PEIM]

   IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

 

@@ -111,24 +107,16 @@
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-  SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

-  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

-

-[LibraryClasses.common.DXE_SAL_DRIVER]

-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

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

-  SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

 

 [LibraryClasses.common.SMM_CORE]

   MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf

-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

+  SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf

   

 [LibraryClasses.common.DXE_SMM_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

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

-  SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

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

   SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

 

 [LibraryClasses.common.UEFI_DRIVER]

@@ -142,59 +130,18 @@
   DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf

 

 [PcdsFeatureFlag]

-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE

-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE

-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE

-

-[PcdsFeatureFlag.IA32]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE

 

 [PcdsFixedAtBuild]

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

-  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000

   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06

-  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF

-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0

-  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0

-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000

-  gEfiMdePkgTokenSpaceGuid.PcdFSBClock|200000000

-  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|28

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x08

-

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1

-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0

-  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10

-

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize|0x20000

-

 

 [PcdsFixedAtBuild.IPF]

   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000