Remove the EDK prefix from library instance folder's name

[mirror_edk2.git] / MdePkg / MdePkg.dsc

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 5914b05d7d0b64435e4a438e26799c4632c34bf9..0f51017f46c4748ac245cb3f12e80ff57e1dc868 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -26,8 +26,8 @@
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = $(WORKSPACE)\Build/Mde\r
-  SUPPORTED_ARCHITECTURES        = IA32 IPF X64 EBC\r
-  BUILD_TARGETS                  = DEBUG,RELEASE\r
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC\r
+  BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 \r
@@ -40,6 +40,8 @@
 [PcdsFeatureFlag.common]\r
   PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid|FALSE\r
   PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid|FALSE\r
+  PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|FALSE\r
+  PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|FALSE\r
 \r
 [PcdsFixedAtBuild.common]\r
   PcdMaximumUnicodeStringLength|gEfiMdePkgTokenSpaceGuid|1000000\r
@@ -72,57 +74,70 @@
 ################################################################################\r
 \r
 [Components.common]\r
-  ${WORKSPACE}\MdePkg\Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseLib/BaseLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseMemoryLib/BaseMemoryLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePciExpressLib/BasePciExpressLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePciLibCf8/BasePciLibCf8.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePciLibPciExpress/BasePciLibPciExpress.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePeCoffLib/BasePeCoffLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
-  ${WORKSPACE}\MdePkg\Library/BasePrintLib/BasePrintLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-  ${WORKSPACE}\MdePkg\Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeHobLib/DxeHobLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxePcdLib/DxePcdLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/DxeSmbusLib/DxeSmbusLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiHobLib/PeiHobLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeimEntryPoint/PeimEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiPcdLib/PeiPcdLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiServicesLib/PeiServicesLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/PeiSmbusLib/PeiSmbusLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiLib/UefiLib.inf\r
-  ${WORKSPACE}\MdePkg\Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
-\r
+  ${WORKSPACE}/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseLib/BaseLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
+  ${WORKSPACE}/MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf\r
+  #${WORKSPACE}/MdePkg/Library/HiiLib/HiiLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiSmbusLibSmbus2/PeiSmbusLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/SerialPortLibNull/SerialPortLibNull.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiLib/UefiLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  ${WORKSPACE}\MdePkg\Library/UefiScsiLib/UefiScsiLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf\r
+  ${WORKSPACE}/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
 \r
 [Components.IA32]\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
 \r
 [Components.X64]\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf\r
+  ${WORKSPACE}/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
+  ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
 \r
-\r
+[Components.IPF]\r
+  ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r