mirror of https://github.com/acidanthera/audk.git
1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:
1.1) Bug fixes. (For details, please check Documents & files: Snapshot/Release Notes at https://edk.tianocore.org/servlets/ProjectDocumentList?folderID=43&expandFolder=43&folderID=6) 1.2) Add new UEFI protocol definitions for AbsolutePointer, FormBrowser2, HiiConfigAccess, HiiConfigRouting, HiiDatabase, HiiFont, HiiImage, HiiString, SimpleTextInputEx, DPC protocol. 1.3) Add Smbios 2.5, 2.6 supports. Incompatible changes hilighted: 1) EFI_MANAGED_NETWORK_PROTOCOL_GUID changed. 2) EFI_IP4_IPCONFIG_DATA changed. 2) Add in EdkCompatibilityPkg/EdkCompatibilityPkg.dsc to build all libraries in this package. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4625 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
95d675b527
commit
565cfeeaba
|
@ -74,12 +74,14 @@ PCCTS_DIR = $(EDK_SOURCE)\Other\Maintained\Tools\Pccts
|
|||
#
|
||||
ANTLR = $(PCCTS_DIR)\bin\antlr
|
||||
DLG = $(PCCTS_DIR)\bin\dlg
|
||||
EXE2BIN = $(EDK_TOOLS_OUTPUT)\Strip
|
||||
FWIMAGE = $(EDK_TOOLS_OUTPUT)\FwImage
|
||||
GENDEPEX = $(EDK_TOOLS_OUTPUT)\GenDepex
|
||||
GENFDIMAGE = $(EDK_TOOLS_OUTPUT)\GenFdImage
|
||||
GENFFSFILE = $(EDK_TOOLS_OUTPUT)\GenFfsFile
|
||||
GENFVIMAGE = $(EDK_TOOLS_OUTPUT)\GenFvImage
|
||||
GENSECTION = $(EDK_TOOLS_OUTPUT)\GenSection
|
||||
GENTEIMAGE = $(EDK_TOOLS_OUTPUT)\GenTEImage
|
||||
GUIDCHK = $(EDK_TOOLS_OUTPUT)\GuidChk
|
||||
MAKEDEPS = $(EDK_TOOLS_OUTPUT)\MakeDeps
|
||||
PROCESSDSC = $(EDK_TOOLS_OUTPUT)\ProcessDsc
|
||||
|
@ -127,20 +129,27 @@ C_FLAGS_ASL = /nologo /EP /C
|
|||
# in the platform specific macros (xxx_PROJ_FLAGS)
|
||||
#
|
||||
C_STD_INCLUDE = /X
|
||||
|
||||
!IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"
|
||||
|
||||
!IF "$(USE_VC8)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX- /GR- /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ENDIF
|
||||
ASM_STD_FLAGS = /nologo /Fl$*.lst $(INC)
|
||||
|
||||
!ELSE
|
||||
|
||||
!IF "$(USE_VC8)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /D USE_VC8 /c /Fo$@ $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /D USE_VC8 /c /Fo$@ $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)
|
||||
!ENDIF
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX- /GR- /Gy /c /Fo$@ $(INC)
|
||||
!ENDIF
|
||||
ASM_STD_FLAGS = /nologo $(INC)
|
||||
|
||||
!ENDIF
|
||||
|
||||
LINK_STD_FLAGS = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\IA32\CompilerStub.lib
|
||||
LIB_STD_FLAGS = /nologo
|
||||
|
||||
|
@ -204,11 +213,12 @@ LINK_STD_FLAGS = $(LINK_STD_FLAGS) /DEBUG
|
|||
#
|
||||
C_STD_INCLUDE = /X
|
||||
!IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /Gy /c /GS- /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /c /GS- /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
ASM_STD_FLAGS = /nologo /Fl$*.lst $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /Gy /c /GS- /Fo$@ $(INC)
|
||||
!ENDIF
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /c /GS- /Fo$@ $(INC)
|
||||
ASM_STD_FLAGS = /nologo $(INC)
|
||||
!ENDIF
|
||||
LINK_STD_FLAGS = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\X64\CompilerStub.lib
|
||||
LIB_STD_FLAGS = /nologo
|
||||
|
||||
|
@ -288,26 +298,31 @@ LINK_STD_FLAGS = $(LINK_STD_FLAGS) /DEBUG
|
|||
# in the platform specific macros (xxx_PROJ_FLAGS)
|
||||
#
|
||||
C_STD_INCLUDE = /X
|
||||
|
||||
!IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"
|
||||
|
||||
!IF "$(USE_VC8_IPF)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ELSE
|
||||
!IF "$(USE_NEWDDK)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX- /GR- /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
!ELSE
|
||||
|
||||
!IF "$(USE_VC8_IPF)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fo$@ $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fo$@ $(INC)
|
||||
!ELSE
|
||||
!IF "$(USE_NEWDDK)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fo$@ $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fo$@ $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX- /GR- /Gy /c /Fo$@ $(INC)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
!ENDIF
|
||||
|
||||
ASM_STD_FLAGS = $(INC)
|
||||
|
@ -389,19 +404,25 @@ LINK_STD_FLAGS = $(LINK_STD_FLAGS) /DEBUG
|
|||
# in the platform specific macros (xxx_PROJ_FLAGS)
|
||||
#
|
||||
!IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"
|
||||
|
||||
!IF "$(USE_VC8)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)
|
||||
!ENDIF
|
||||
ASM_STD_FLAGS = /nologo /Fl$*.lst $(INC)
|
||||
|
||||
!ELSE
|
||||
|
||||
!IF "$(USE_VC8)" == "YES"
|
||||
C_STD_FLAGS = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fo$@ $(INC)
|
||||
!ELSE
|
||||
C_STD_FLAGS = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
ASM_STD_FLAGS = /nologo $(INC)
|
||||
|
||||
!ENDIF
|
||||
|
||||
LINK_STD_FLAGS = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF
|
||||
LIB_STD_FLAGS = /nologo
|
||||
|
||||
|
@ -552,50 +573,69 @@ VERSION_FLAGS = /D EFI_SPECIFICATION_VERSION=$(EFI_SPECIFICATION_VERSION)
|
|||
/D TIANO_RELEASE_VERSION=$(TIANO_RELEASE_VERSION)
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) $(VERSION_FLAGS)
|
||||
EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) $(VERSION_FLAGS)
|
||||
C_FLAGS_ASL = $(C_FLAGS_ASL) $(VERSION_FLAGS)
|
||||
VFRCOMPILE_FLAGS = $(VFRCOMPILE_FLAGS) -ppflag "$(VERSION_FLAGS)"
|
||||
!IF "$(TOOLCHAIN)" != "TOOLCHAIN_IPF"
|
||||
ASM_STD_FLAGS = $(ASM_STD_FLAGS) $(VERSION_FLAGS)
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_DEBUG)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_DEBUG
|
||||
EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /D EFI_DEBUG
|
||||
VFRCOMPILE_FLAGS = $(VFRCOMPILE_FLAGS) -ppflag "/D EFI_DEBUG"
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_DEBUG
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_DEBUG_CLEAR_MEMORY)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_DEBUG_CLEAR_MEMORY
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_DEBUG_CLEAR_MEMORY
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_PEI_PERFORMANCE)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_PEI_PERFORMANCE /D EFI_DXE_PERFORMANCE
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_PEI_PERFORMANCE /D EFI_DXE_PERFORMANCE
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_ADDTIONAL_DRIVERS)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_ADDTIONAL_DRIVERS
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_ADDTIONAL_DRIVERS
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_USE_CUSTOM_COMPRESS)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_USE_CUSTOM_COMPRESS
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_USE_CUSTOM_COMPRESS
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_UNLOCK_FWH)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_UNLOCK_FWH
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_UNLOCK_FWH
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_DXE_PERFORMANCE)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_DXE_PERFORMANCE
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_DEBUG_SERIAL_PRINT)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_DEBUG_SERIAL_PRINT
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_DXE_PERFORMANCE
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_S3_RESUME)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_S3_RESUME
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_S3_RESUME
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_SIZE_REDUCTION_APPLIED)" == "YES"
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_SIZE_REDUCTION_APPLIED
|
||||
!ENDIF
|
||||
|
||||
!IF "$(EFI_PEI_REPORT_STATUS_CODE)" == "YES"
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) /D EFI_PEI_REPORT_STATUS_CODE_ON
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_PEI_REPORT_STATUS_CODE_ON
|
||||
!ENDIF
|
||||
|
||||
!IF "$(SIZE_REDUCTION_ISA_COMBINED)" == "YES"
|
||||
FEATURE_FLAGS = $(FEATURE_FLAGS) /D SIZE_REDUCTION_ISA_COMBINED
|
||||
!ENDIF
|
||||
|
||||
C_STD_FLAGS = $(C_STD_FLAGS) $(FEATURE_FLAGS)
|
||||
EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) $(FEATURE_FLAGS)
|
||||
C_FLAGS_ASL = $(C_FLAGS_ASL) $(FEATURE_FLAGS)
|
||||
VFRCOMPILE_FLAGS = $(VFRCOMPILE_FLAGS) -ppflag "$(FEATURE_FLAGS)"
|
||||
!IF "$(TOOLCHAIN)" != "TOOLCHAIN_IPF"
|
||||
ASM_STD_FLAGS = $(ASM_STD_FLAGS) $(FEATURE_FLAGS)
|
||||
!ENDIF
|
||||
|
||||
#
|
||||
# This is used for preprocessing dependency files
|
||||
#
|
||||
C_FLAGS_DPX = /nologo /EP $(INC) $(VERSION_FLAGS) $(FEATURE_FLAGS)
|
||||
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
|
@ -666,7 +706,7 @@ COMPRESS_METHOD = Dummy
|
|||
#
|
||||
###############################################################################
|
||||
!IFNDEF EFI_BINARY
|
||||
EFI_BINARY=$(EDK_TOOLS_OUTPUT)\Bin
|
||||
EFI_BINARY=$(EDK_SOURCE)\Bin
|
||||
!ENDIF
|
||||
|
||||
EFI_PLATFORM_BIN=$(EFI_BINARY)\$(PROJECT_NAME)$(BUILD_TARGET_DIRECTORY)
|
||||
|
|
|
@ -20,7 +20,14 @@
|
|||
#--*/
|
||||
|
||||
!IF "$(UEFI_MODE)" == "YES"
|
||||
EFI_SPECIFICATION_VERSION = 0x00020000
|
||||
!IFDEF UEFI_VERSION_OVERRIDE
|
||||
!IF "$(UEFI_VERSION_OVERRIDE)" < "0x00020000"
|
||||
!ERROR UEFI_VERSION_OVERRIDE must greater than or equal to 0x00020000
|
||||
!ENDIF
|
||||
EFI_SPECIFICATION_VERSION = $(UEFI_VERSION_OVERRIDE)
|
||||
!ELSE
|
||||
EFI_SPECIFICATION_VERSION = 0x0002000A
|
||||
!ENDIF
|
||||
!ELSE
|
||||
EFI_SPECIFICATION_VERSION = 0x0001000A
|
||||
!ENDIF
|
||||
|
|
Loading…
Reference in New Issue