X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=EdkCompatibilityPkg%2FEdkCompatibilityPkg.dsc;h=4169d699eec2f3cacd05b7c18e62d9aa9b991145;hb=9a737ffeab007e375c32b21aef2cc02cfeec12b2;hp=69bca2eb03b9e31883683cee35256152541dc91d;hpb=7794baccd12bb8f40bdc9c4af92c380026a31068;p=mirror_edk2.git diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc index 69bca2eb03..4169d699ee 100644 --- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc +++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc @@ -25,11 +25,12 @@ PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/EdkCompatibilityPkg - SUPPORTED_ARCHITECTURES = IA32|X64|IPF + SUPPORTED_ARCHITECTURES = IA32|X64|IPF|EBC BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT -define MSFT_MACRO = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 -define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_SPECIFICATION_VERSION=0x00010000 -DTIANO_RELEASE_VERSION=0x00080006 +define MSFT_MACRO = /D EFI_SPECIFICATION_VERSION=0x00020000 /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG +define INTEL_MACRO = /D EFI_SPECIFICATION_VERSION=0x00020000 /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG +define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x00020000 -DPI_SPECIFICATION_VERSION=0x00009000 -DTIANO_RELEASE_VERSION=0x00080006 -DPCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 -DEFI_DEBUG ################################################################################ # @@ -40,25 +41,36 @@ define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S [SkuIds] 0|DEFAULT # The entry: 0|DEFAULT is reserved and always required. -[BuildOptions] - MSFT:*_*_IA32_CC_FLAGS = /D EFI32 $(MSFT_MACRO) - MSFT:*_*_IA32_ASM_FLAGS = /DEFI32 - MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO) - MSFT:*_*_IA32_APP_FLAGS = /D EFI32 $(MSFT_MACRO) - MSFT:*_*_IA32_PP_FLAGS = /D EFI32 $(MSFT_MACRO) - - MSFT:*_*_X64_CC_FLAGS = /D EFIX64 $(MSFT_MACRO) - MSFT:*_*_X64_ASM_FLAGS = /DEFIX64 - MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64 $(MSFT_MACRO) - MSFT:*_*_X64_APP_FLAGS = /D EFIX64 $(MSFT_MACRO) - MSFT:*_*_X64_PP_FLAGS = /D EFIX64 $(MSFT_MACRO) - - MSFT:*_*_IPF_CC_FLAGS = /D EFI64 $(MSFT_MACRO) - MSFT:*_*_IPF_ASM_FLAGS = /DEFI64 - MSFT:*_*_IPF_VFRPP_FLAGS = /D EFI64 $(MSFT_MACRO) - MSFT:*_*_IPF_APP_FLAGS = /D EFI64 $(MSFT_MACRO) - MSFT:*_*_IPF_PP_FLAGS = /D EFI64 $(MSFT_MACRO) +[LibraryClasses.common] + BaseLib|MdePkg/Library/BaseLib/BaseLib.inf + UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf + HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf + ExtendedHiiLib|MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf + IfrSupportLib|MdeModulePkg/Library/UefiIfrSupportLib/UefiIfrSupportLib.inf + ExtendedIfrSupportLib|MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf + UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf + UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + PalLib|MdePkg/Library/BasePalLibNull/BasePalLibNull.inf + UefiLib|MdePkg/Library/UefiLib/UefiLib.inf + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf + PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf + PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf + PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf + +[LibraryClasses.common.PEIM] + HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf + MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf + +[LibraryClasses.common.DXE_DRIVER] + MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf +[BuildOptions] GCC:*_*_IA32_CC_FLAGS = -DEFI32 $(GCC_MACRO) GCC:*_*_IA32_ASM_FLAGS = -DEFI32 GCC:*_*_IA32_VFRPP_FLAGS = -DEFI32 $(GCC_MACRO) @@ -72,12 +84,52 @@ define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S GCC:*_*_X64_PP_FLAGS = -DEFIX64 $(GCC_MACRO) GCC:*_*_IPF_CC_FLAGS = -DEFI64 $(GCC_MACRO) - GCC:*_*_IPF_ASM_FLAGS = -DEFI64 + GCC:*_*_IPF_ASM_FLAGS = GCC:*_*_IPF_VFRPP_FLAGS = -DEFI64 $(GCC_MACRO) GCC:*_*_IPF_APP_FLAGS = -DEFI64 $(GCC_MACRO) GCC:*_*_IPF_PP_FLAGS = -DEFI64 $(GCC_MACRO) + INTEL:*_*_IA32_CC_FLAGS = /D EFI32 $(MSFT_MACRO) + INTEL:*_*_IA32_ASM_FLAGS = /DEFI32 + INTEL:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO) + INTEL:*_*_IA32_APP_FLAGS = /D EFI32 $(MSFT_MACRO) + INTEL:*_*_IA32_PP_FLAGS = /D EFI32 $(MSFT_MACRO) + + INTEL:*_*_EBC_CC_FLAGS = /D EFI32 $(MSFT_MACRO) + INTEL:*_*_EBC_PP_FLAGS = /D EFI32 $(MSFT_MACRO) + + INTEL:*_*_X64_CC_FLAGS = /D EFIX64 $(MSFT_MACRO) + INTEL:*_*_X64_ASM_FLAGS = /DEFIX64 + INTEL:*_*_X64_VFRPP_FLAGS = /D EFIX64 $(MSFT_MACRO) + INTEL:*_*_X64_APP_FLAGS = /D EFIX64 $(MSFT_MACRO) + INTEL:*_*_X64_PP_FLAGS = /D EFIX64 $(MSFT_MACRO) + + INTEL:*_*_IPF_CC_FLAGS = /D EFI64 $(MSFT_MACRO) + INTEL:*_*_IPF_ASM_FLAGS = + INTEL:*_*_IPF_VFRPP_FLAGS = /D EFI64 $(MSFT_MACRO) + INTEL:*_*_IPF_APP_FLAGS = /D EFI64 $(MSFT_MACRO) + INTEL:*_*_IPF_PP_FLAGS = /D EFI64 $(MSFT_MACRO) + + + MSFT:*_*_IA32_CC_FLAGS = /D EFI32 $(MSFT_MACRO) + MSFT:*_*_IA32_ASM_FLAGS = /DEFI32 + MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO) + MSFT:*_*_IA32_APP_FLAGS = /D EFI32 $(MSFT_MACRO) + MSFT:*_*_IA32_PP_FLAGS = /D EFI32 $(MSFT_MACRO) + + MSFT:*_*_X64_CC_FLAGS = /D EFIX64 $(MSFT_MACRO) + MSFT:*_*_X64_ASM_FLAGS = /DEFIX64 + MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64 $(MSFT_MACRO) + MSFT:*_*_X64_APP_FLAGS = /D EFIX64 $(MSFT_MACRO) + MSFT:*_*_X64_PP_FLAGS = /D EFIX64 $(MSFT_MACRO) + + MSFT:*_*_IPF_CC_FLAGS = /D EFI64 $(MSFT_MACRO) + MSFT:*_*_IPF_ASM_FLAGS = + MSFT:*_*_IPF_VFRPP_FLAGS = /D EFI64 $(MSFT_MACRO) + MSFT:*_*_IPF_APP_FLAGS = /D EFI64 $(MSFT_MACRO) + MSFT:*_*_IPF_PP_FLAGS = /D EFI64 $(MSFT_MACRO) + [Components.Common] @@ -107,6 +159,9 @@ define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiEfiIfrSupportLib.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseDebugLibNull/BaseDebugLibNull.inf + # + # Need to sync with MdePkg\Library\BaseIoLibIntrinsic\BaseIoLibIntrinsic.inf so that EBC can pass build + # EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/BaseMemoryLib.inf @@ -153,11 +208,10 @@ define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiLib.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf - EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf + EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.inf - EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.inf - EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib.inf - EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib.inf + EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/EfiRuntimeLib_Edk2.inf + EdkCompatibilityPkg/Foundation/Library/Thunk16/Thunk16Lib_Edk2.inf EdkCompatibilityPkg/Foundation/Ppi/EdkPpiLib.inf EdkCompatibilityPkg/Foundation/Protocol/EdkProtocolLib.inf EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.inf @@ -170,11 +224,27 @@ define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S EdkCompatibilityPkg/Sample/Platform/Nt32/Ppi/EdkNt32PpiLib.inf EdkCompatibilityPkg/Sample/Platform/Nt32/Protocol/EdkNt32ProtocolLib.inf + # + # Modules in Compatibility Directory + # + EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.inf + EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf + EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.inf + EdkCompatibilityPkg/Compatibility/FvToFv2Thunk/FvToFv2Thunk.inf + EdkCompatibilityPkg/Compatibility/Fv2ToFvThunk/Fv2ToFvThunk.inf + EdkCompatibilityPkg/Compatibility/PciCfg2ToPciCfgThunk/PciCfg2ToPciCfgThunk.inf + EdkCompatibilityPkg/Compatibility/PciCfgToPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf + EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf + EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf + EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf + EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.inf + +[Components.IA32,Components.X64,Components.IPF] + EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib_Edk2.inf + [Components.IA32,Components.X64] - EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf + EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.inf - EdkCompatibilityPkg/Sample/Library/Dxe/WinNt/WinNtLib.inf - [Components.IPF] EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf