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@10528 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 10 insertions, 68 deletions

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 83081d3015..71cd6b094b 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -42,21 +42,12 @@
   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

   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

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

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

   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

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

   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

-  S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf

-  RecoveryLib|IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

@@ -66,90 +57,41 @@
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf

-

-[LibraryClasses.common.PEIM]

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

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

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

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

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

-  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

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

-

-[LibraryClasses.common.DXE_DRIVER]

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

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

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

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

   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

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

   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  IoLib|IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf

-

-[LibraryClasses.common.DXE_RUNTIME_DRIVER]

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

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

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

-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

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

-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

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

   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

-  IoLib|IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf

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

+

+[LibraryClasses.common.PEIM]

+  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

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

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

 

-[LibraryClasses.common.UEFI_DRIVER]

+[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

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

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

-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

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

-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

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

-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

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

-  IoLib|IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf

 

-[LibraryClasses.common.DXE_SMM_DRIVER]

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

-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

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

-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

-  

+[LibraryClasses.common.DXE_RUNTIME_DRIVER]

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

+ 

 ################################################################################

 #

 # Pcd Section - list of all EDK II PCD Entries defined by this Platform

 #

 ################################################################################

 [PcdsFeatureFlag]

-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE

-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE

-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE

-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE

 

 [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.PcdPciExpressBaseAddress|0xE0000000

-  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1

-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0

 

 [PcdsFixedAtBuild.IPF]

   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000