Removed unneeded $(WORKSPACE)\ in *.DSC files. Also synced MdePkg.dec file with package specification update

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3490 6f19259b-4bc3-4df7-8a09-765794883524
2007-07-27 19:07:27 +00:00
parent d0dc913e41
commit 409f67804d
6 changed files with 596 additions and 592 deletions
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -279,7 +279,7 @@
  PcdDriverDiagnosticsDisable|0x0000000e|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE
  PcdComponentName2Disable|0x000000010|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE
  PcdDriverDiagnostics2Disable|0x00000011|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE
-  PcdUefiVariableDefaultLangDepricate|0x0000001a|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE
+  PcdUefiVariableDefaultLangDepricate|0x00000012|gEfiMdePkgTokenSpaceGuid|BOOLEAN|FALSE

 [PcdsFixedAtBuild.common]
  PcdMaximumUnicodeStringLength|0x00000001|gEfiMdePkgTokenSpaceGuid|UINT32|1000000
@@ -295,21 +295,21 @@
  PcdPostCodePropertyMask|0x0000000b|gEfiMdePkgTokenSpaceGuid|UINT8|0
  PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000
  PcdUefiLibMaxPrintBufferSize|0x101|gEfiMdePkgTokenSpaceGuid|UINT32|320
-  PcdStatusCodeValueEfiWatchDogTimerExpired|0x0000000d|gEfiMdePkgTokenSpaceGuid|UINT32|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED
-  PcdStatusCodeValueSetVirtualAddressMap|0x0000000e|gEfiMdePkgTokenSpaceGuid|UINT32|0x03101004      # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP
-  PcdStatusCodeValueMemoryTestStarted|0x0000000f|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051006         # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST
-  PcdStatusCodeValueUncorrectableMemoryError|0x00000011|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051003  # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE
-  PcdStatusCodeValueRemoteConsoleError|0x00000012|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR
-  PcdStatusCodeValueRemoteConsoleReset|0x00000013|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET
-  PcdStatusCodeValueRemoteConsoleInputError|0x00000014|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR
-  PcdStatusCodeValueRemoteConsoleOutputError|0x00000015|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR
-  PcdUefiVariableDefaultTimeout|0x00000016|gEfiMdePkgTokenSpaceGuid|UINT16|0x0008
-  PcdUefiVariableDefaultLangCodes|0x00000017|gEfiMdePkgTokenSpaceGuid|VOID*|"engfra"
-  PcdUefiVariableDefaultLang|0x00000018|gEfiMdePkgTokenSpaceGuid|VOID*|"eng"
-  PcdUefiVariableDefaultPlatformLangCodes|0x00000019|gEfiMdePkgTokenSpaceGuid|VOID*|"en"
-  PcdUefiVariableDefaultPlatformLang|0x0000001a|gEfiMdePkgTokenSpaceGuid|VOID*|"en;fr"
+  PcdStatusCodeValueEfiWatchDogTimerExpired|0x00000013|gEfiMdePkgTokenSpaceGuid|UINT32|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED
+  PcdStatusCodeValueSetVirtualAddressMap|0x00000014|gEfiMdePkgTokenSpaceGuid|UINT32|0x03101004      # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP
+  PcdStatusCodeValueMemoryTestStarted|0x00000015|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051006         # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST
+  PcdStatusCodeValueUncorrectableMemoryError|0x00000016|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051003  # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE
+  PcdStatusCodeValueRemoteConsoleError|0x00000017|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR
+  PcdStatusCodeValueRemoteConsoleReset|0x00000018|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET
+  PcdStatusCodeValueRemoteConsoleInputError|0x00000019|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR
+  PcdStatusCodeValueRemoteConsoleOutputError|0x0000001a|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR
+  PcdUefiVariableDefaultTimeout|0x0000001b|gEfiMdePkgTokenSpaceGuid|UINT16|0x0008
+  PcdUefiVariableDefaultLangCodes|0x0000001c|gEfiMdePkgTokenSpaceGuid|VOID*|"engfra"
+  PcdUefiVariableDefaultLang|0x0000001d|gEfiMdePkgTokenSpaceGuid|VOID*|"eng"
+  PcdUefiVariableDefaultPlatformLangCodes|0x0000001e|gEfiMdePkgTokenSpaceGuid|VOID*|"en"
+  PcdUefiVariableDefaultPlatformLang|0x0000001f|gEfiMdePkgTokenSpaceGuid|VOID*|"en;fr"

-[PcdsPatchableInModule.common]
+[PcdsFixedAtBuild.common]
  PcdDebugPrintErrorLevel|0x00000006|gEfiMdePkgTokenSpaceGuid|UINT32|0x80000000
  PcdPciExpressBaseAddress|0x0000000a|gEfiMdePkgTokenSpaceGuid|UINT64|0xE0000000
  PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -18,7 +18,7 @@
  PLATFORM_GUID                  = 082F8BFC-0455-4859-AE3C-ECD64FB81642
  PLATFORM_VERSION               = 0.1
  DSC_SPECIFICATION              = 0x00010005
-  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/Mde
+  OUTPUT_DIRECTORY               = Build/Mde
  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC
  BUILD_TARGETS                  = DEBUG|RELEASE
  SKUID_IDENTIFIER               = DEFAULT
@@ -55,77 +55,77 @@
  PcdIoBlockBaseAddressForIpf|gEfiMdePkgTokenSpaceGuid|0x0ffffc000000

 [Components.common]
-  $(WORKSPACE)/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  $(WORKSPACE)/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  $(WORKSPACE)/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  $(WORKSPACE)/MdePkg/Library/BaseLib/BaseLib.inf
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-  $(WORKSPACE)/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
-  $(WORKSPACE)/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  $(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
-  $(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
-  $(WORKSPACE)/MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  $(WORKSPACE)/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
-  $(WORKSPACE)/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  $(WORKSPACE)/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  $(WORKSPACE)/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
-  $(WORKSPACE)/MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  $(WORKSPACE)/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
-  $(WORKSPACE)/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.inf
-  $(WORKSPACE)/MdePkg/Library/SerialPortLibNull/SerialPortLibNull.inf
-  $(WORKSPACE)/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  $(WORKSPACE)/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  $(WORKSPACE)/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
-  $(WORKSPACE)/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
-  $(WORKSPACE)/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  $(WORKSPACE)/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
-  $(WORKSPACE)/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  $(WORKSPACE)/MdePkg/Library/UefiLib/UefiLib.inf
-  $(WORKSPACE)/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  $(WORKSPACE)/MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  $(WORKSPACE)/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
-  $(WORKSPACE)/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
-  $(WORKSPACE)/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
-  $(WORKSPACE)/MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  $(WORKSPACE)/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+  MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  MdePkg/Library/BaseLib/BaseLib.inf
+  MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+  MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
+  MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
+  MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
+  MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+  MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+  MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+  MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+  MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+  MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+  MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+  MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+  MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+  MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  MdePkg/Library/PeiHobLib/PeiHobLib.inf
+  MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
+  MdePkg/Library/DxePcdLib/DxePcdLib.inf
+  MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
+  MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
+  MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+  MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+  MdePkg/Library/PeiHobLib/PeiHobLib.inf
+  MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
+  MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf
+  MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+  MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+  MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf
+  MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
+  MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
+  MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.inf
+  MdePkg/Library/SerialPortLibNull/SerialPortLibNull.inf
+  MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+  MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+  MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
+  MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
+  MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+  MdePkg/Library/UefiLib/UefiLib.inf
+  MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+  MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
+  MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
+  MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+  MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+  MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

 [Components.IA32]
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
-  $(WORKSPACE)/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  $(WORKSPACE)/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
+  MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+  MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+  MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+  MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
+  MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf

 [Components.X64]
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-  $(WORKSPACE)/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
-  $(WORKSPACE)/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  $(WORKSPACE)/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf
+  MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
+  MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+  MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.inf
+  MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+  MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
+  MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf

 [Components.IPF]
-  $(WORKSPACE)/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
-  $(WORKSPACE)/MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf
+  MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+  MdePkg/Library/PeiServicesTablePointerLibKr7/PeiServicesTablePointerLibKr7.inf