From 7236d37bcd24dfbc15a178e9f4fa89b60aee5b56 Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Wed, 22 Mar 2023 18:30:37 +0300 Subject: [PATCH] Conf: Remove unused IPHONE_TOOLS, SOURCERY_CYGWIN_TOOLS defs and EBC (EFI Byte Code) compiler definitions. --- BaseTools/Conf/tools_def.template | 102 ------------------------------ 1 file changed, 102 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 328dea5187..fc18a31724 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -86,10 +86,6 @@ DEFINE WINSDK10_BIN = ENV(WINSDK10_PREFIX)DEF(VS_HOST) DEFINE WINDDK_BIN16 = ENV(WINDDK3790_PREFIX)bin16 DEFINE WINDDK_BINX64 = ENV(WINDDK3790_PREFIX)win64\x86\amd64 -DEFINE EBC_BIN = C:\Program Files\Intel\EBC\Bin -DEFINE EBC_BINx86 = C:\Program Files (x86)\Intel\EBC\Bin - - DEFINE CYGWIN_BIN = c:/cygwin/bin DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/ DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/ @@ -122,10 +118,6 @@ DEFINE MSFT_ASLCC_FLAGS = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcp DEFINE MSFT_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE DEFINE MSFT_DLINK_COMMON = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER DEF(MSFT_ALIGN) DEF(MSFT_MERGE) -DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Developer - -DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin - DEFINE DTCPP_BIN = ENV(DTCPP_PREFIX)cpp DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc @@ -159,16 +151,12 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc # Microsoft Visual Studio 2015 Professional Edition # Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830 # Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) from # https://acpica.org/downloads # VS2017 -win32- Requires: # Microsoft Visual Studio 2017 version 15.2 (15.4 for ARM64) or later # Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) from # https://acpica.org/downloads @@ -178,8 +166,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc # VS2019 -win32- Requires: # Microsoft Visual Studio 2019 version 16.2 or later # Optional: -# Required to build EBC drivers: -# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler) # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler (iasl.exe) from # https://acpica.org/downloads @@ -245,22 +231,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc #################################################################################### #################################################################################### # -# Intel EFI Byte Code Compiler (Template) -# -#################################################################################### -# *_*_EBC_*_FAMILY = INTEL -# -# *_*_EBC_PP_PATH = C:\Program Files\Intel\EBC\Bin\iec.exe -# *_*_EBC_CC_PATH = C:\Program Files\Intel\EBC\Bin\iec.exe -# *_*_EBC_SLINK_PATH = C:\Program Files\Intel\EBC\Bin\link.exe -# -# *_*_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC -# *_*_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h -# *_*_EBC_CC_FLAGS = /nologo /FAcs /c /W3 /WX /FIAutoGen.h -# *_*_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /DRIVER DEF(MSFT_ALIGN) -# -#################################################################################### -# # Intel ACPI Source Language Compiler (Template) # #################################################################################### @@ -375,25 +345,6 @@ NOOPT_VS2015_X64_NASM_FLAGS = -O0 -f win64 -g -DRODATA_SECTION_NAME=.rdata RELEASE_VS2015_X64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /IGNORE:4254 /MACHINE:X64 NOOPT_VS2015_X64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /MACHINE:X64 /DEBUG -################## -# EBC definitions -################## -*_VS2015_EBC_*_FAMILY = INTEL -*_VS2015_EBC_*_DLL = DEF(VS2015_DLL) - -*_VS2015_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe -*_VS2015_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe -*_VS2015_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe -*_VS2015_EBC_SLINK_PATH = DEF(VS2015_BIN)\link.exe -*_VS2015_EBC_DLINK_PATH = DEF(VS2015_BIN)\link.exe - -*_VS2015_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h -*_VS2015_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) -*_VS2015_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h -*_VS2015_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC -*_VS2015_EBC_DLINK_FLAGS = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /DRIVER DEF(MSFT_ALIGN) - - #################################################################################### # VS2015x86 - Microsoft Visual Studio 2015 (x86) professional with Intel ASL # ASL - Intel ACPI Source Language Compiler (iasl.exe) @@ -487,25 +438,6 @@ NOOPT_VS2015x86_X64_NASM_FLAGS = -O0 -f win64 -g -DRODATA_SECTION_NAME=.rdat RELEASE_VS2015x86_X64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /IGNORE:4254 /MACHINE:X64 NOOPT_VS2015x86_X64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /MACHINE:X64 /DEBUG -################## -# EBC definitions -################## -*_VS2015x86_EBC_*_FAMILY = INTEL -*_VS2015x86_EBC_*_DLL = DEF(VS2015x86_DLL) - -*_VS2015x86_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2015x86_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2015x86_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2015x86_EBC_SLINK_PATH = DEF(VS2015x86_BIN)\link.exe -*_VS2015x86_EBC_DLINK_PATH = DEF(VS2015x86_BIN)\link.exe - -*_VS2015x86_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h -*_VS2015x86_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) -*_VS2015x86_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h -*_VS2015x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC -*_VS2015x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /DRIVER DEF(MSFT_ALIGN) - - #################################################################################### # VS2017 - Microsoft Visual Studio 2017 with Intel ASL # ASL - Intel ACPI Source Language Compiler (iasl.exe) @@ -647,23 +579,6 @@ NOOPT_VS2017_AARCH64_ASM_FLAGS = /nologo RELEASE_VS2017_AARCH64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /IGNORE:4254 /MACHINE:ARM64 NOOPT_VS2017_AARCH64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /MACHINE:ARM64 /DEBUG -################## -# EBC definitions -################## -*_VS2017_EBC_*_FAMILY = INTEL - -*_VS2017_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2017_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2017_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2017_EBC_SLINK_PATH = DEF(VS2017_BIN_IA32)\link.exe -*_VS2017_EBC_DLINK_PATH = DEF(VS2017_BIN_IA32)\link.exe - -*_VS2017_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h -*_VS2017_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) -*_VS2017_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h -*_VS2017_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC -*_VS2017_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /DRIVER DEF(MSFT_ALIGN) - #################################################################################### # VS2019 - Microsoft Visual Studio 2019 with Intel ASL # ASL - Intel ACPI Source Language Compiler (iasl.exe) @@ -805,23 +720,6 @@ NOOPT_VS2019_AARCH64_ASM_FLAGS = /nologo RELEASE_VS2019_AARCH64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /IGNORE:4254 /MACHINE:ARM64 NOOPT_VS2019_AARCH64_DLINK_FLAGS = DEF(MSFT_DLINK_COMMON) /MACHINE:ARM64 /DEBUG -################## -# EBC definitions -################## -*_VS2019_EBC_*_FAMILY = INTEL - -*_VS2019_EBC_PP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2019_EBC_VFRPP_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2019_EBC_CC_PATH = DEF(EBC_BINx86)\iec.exe -*_VS2019_EBC_SLINK_PATH = DEF(VS2019_BIN_IA32)\link.exe -*_VS2019_EBC_DLINK_PATH = DEF(VS2019_BIN_IA32)\link.exe - -*_VS2019_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h -*_VS2019_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT) -*_VS2019_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h -*_VS2019_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC -*_VS2019_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /DRIVER DEF(MSFT_ALIGN) - #################################################################################### # GCC Common ####################################################################################