Clean up Nt32Pkg and DuetPkg DSCs to move common used library instance to Common [LibraryClasses] section.

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

2 files changed, 144 insertions, 58 deletions

diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc
index 8ec22244fc..2d6b2afb24 100644
--- a/DuetPkg/DuetPkgIa32.dsc
+++ b/DuetPkg/DuetPkgIa32.dsc
@@ -16,6 +16,11 @@
 #

 ##

 

+################################################################################

+#

+# Defines Section - statements that will be processed to create a Makefile.

+#

+################################################################################

 [Defines]

   PLATFORM_NAME                  = DuetPkg

   PLATFORM_GUID                  = 199E24E0-0989-42aa-87F2-611A8C397E72

@@ -27,45 +32,73 @@
   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf

 

+################################################################################

+#

+# Library Class section - list of all Library Classes needed by this Platform.

+#

+################################################################################

 [LibraryClasses]

+  #

+  # Entry point

+  #

+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

+  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

+  #

+  # Basic

+  #

   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

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

   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

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

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

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

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

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

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.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

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

+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

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

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

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

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

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

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

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

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

-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  PlatformBdsLib|DuetPkg/Library/DuetBdsLib/PlatformBds.inf

+  

+  #

+  # Generic Modules

+  #

+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

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

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

   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

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

+  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

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

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

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

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

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

   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

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

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

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

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

+  #

+  # Platform

+  #

+  PlatformBdsLib|DuetPkg/Library/DuetBdsLib/PlatformBds.inf

   TimerLib|DuetPkg/Library/DuetTimerLib/DuetTimerLib.inf

-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

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

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

-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

+  #

+  # Misc

+  #

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

   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

-

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

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

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

+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

+  

   #

   # To save size, use NULL library for DebugLib and ReportStatusCodeLib.

   # If need status code output, do library instance overriden as below DxeMain.inf does

@@ -75,11 +108,13 @@
 

 [LibraryClasses.common.DXE_CORE]

   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

   MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf

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

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

+################################################################################

+#

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

+#

+################################################################################

 [PcdsFixedAtBuild]

   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0

@@ -107,7 +142,6 @@
 #       generated for it, but the binary will not be put into any firmware volume.

 #

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

-

 [Components]

   DuetPkg/DxeIpl/DxeIpl.inf {

     <LibraryClasses>

@@ -214,6 +248,15 @@
   #

   MdeModulePkg/Application/HelloWorld/HelloWorld.inf

 

+###################################################################################################

+#

+# BuildOptions Section - Define the module specific tool chain flags that should be used as

+#                        the default flags for a module. These flags are appended to any 

+#                        standard flags that are defined by the build process. They can be 

+#                        applied for any modules or only those modules with the specific 

+#                        module style (EDK or EDKII) specified in [Components] section.

+#

+###################################################################################################

 [BuildOptions]

   MSFT:*_*_*_CC_FLAGS = /FAsc /FR$(@R).SBR

 

diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc
index 9df5e23b38..a75c5a1afe 100644
--- a/DuetPkg/DuetPkgX64.dsc
+++ b/DuetPkg/DuetPkgX64.dsc
@@ -16,6 +16,11 @@
 #

 ##

 

+################################################################################

+#

+# Defines Section - statements that will be processed to create a Makefile.

+#

+################################################################################

 [Defines]

   PLATFORM_NAME                  = DuetPkg

   PLATFORM_GUID                  = 199E24E0-0989-42aa-87F2-611A8C397E72

@@ -27,45 +32,73 @@
   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf

 

+################################################################################

+#

+# Library Class section - list of all Library Classes needed by this Platform.

+#

+################################################################################

 [LibraryClasses]

+  #

+  # Entry point

+  #

+  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

+  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

+  #

+  # Basic

+  #

   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

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

   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

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

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

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

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

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

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.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

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

+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

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

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

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

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

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

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

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

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

-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  PlatformBdsLib|DuetPkg/Library/DuetBdsLib/PlatformBds.inf

+  

+  #

+  # Generic Modules

+  #

+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

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

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

   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

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

+  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

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

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

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

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

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

   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

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

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

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

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

+  #

+  # Platform

+  #

+  PlatformBdsLib|DuetPkg/Library/DuetBdsLib/PlatformBds.inf

   TimerLib|DuetPkg/Library/DuetTimerLib/DuetTimerLib.inf

-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

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

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

-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

+  #

+  # Misc

+  #

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

   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

-

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

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

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

+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

+  

   #

   # To save size, use NULL library for DebugLib and ReportStatusCodeLib.

   # If need status code output, do library instance overriden as below DxeMain.inf does

@@ -75,11 +108,13 @@
 

 [LibraryClasses.common.DXE_CORE]

   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

   MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf

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

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

+################################################################################

+#

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

+#

+################################################################################

 [PcdsFixedAtBuild]

   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0

@@ -107,7 +142,6 @@
 #       generated for it, but the binary will not be put into any firmware volume.

 #

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

-

 [Components]

   DuetPkg/DxeIpl/DxeIpl.inf {

     <LibraryClasses>

@@ -214,6 +248,15 @@
   #

   MdeModulePkg/Application/HelloWorld/HelloWorld.inf

 

+###################################################################################################

+#

+# BuildOptions Section - Define the module specific tool chain flags that should be used as

+#                        the default flags for a module. These flags are appended to any 

+#                        standard flags that are defined by the build process. They can be 

+#                        applied for any modules or only those modules with the specific 

+#                        module style (EDK or EDKII) specified in [Components] section.

+#

+###################################################################################################

 [BuildOptions]

   MSFT:*_*_*_CC_FLAGS = /FAsc /FR$(@R).SBR