BaseTools/tools_def.template: Remove tools chain with ASL tool

Microsoft ASL is not verified now.
So remove tool chain with ASL tool. They are: VS2008xASL,
VS2008x86xASL, VS2010xASL, VS2010x86xASL, VS2012xASL, VS2012x86xASL,
VS2013xASL, VS2013x86xASL, VS2015xASL, VS2015x86xASL and CYGGCCxASL.
https://bugzilla.tianocore.org/show_bug.cgi?id=1667

v2:Remove definitions of WIN_ASL_BIN, MS_ASL_OUTFLAGS and MS_ASL_FLAGS.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b9e66002d0e47a3b2690bac13a73c9da4e1c223b..26a2cf604f74dcacff9d46676b809f75ed499eec 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -117,19 +117,13 @@ DEFINE GCC_HOST_PREFIX         = ENV(GCC_HOST_BIN)
 \r
 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl\r
 DEFINE WIN_IASL_BIN            = ENV(IASL_PREFIX)iasl.exe\r
-DEFINE WIN_ASL_BIN             = ENV(IASL_PREFIX)asl.exe\r
 \r
 DEFINE IASL_FLAGS              =\r
 DEFINE IASL_OUTFLAGS           = -p\r
-DEFINE MS_ASL_OUTFLAGS         = /Fo=\r
-DEFINE MS_ASL_FLAGS            =\r
 \r
 DEFINE DEFAULT_WIN_ASL_BIN      = DEF(WIN_IASL_BIN)\r
 DEFINE DEFAULT_WIN_ASL_FLAGS    = DEF(IASL_FLAGS)\r
 DEFINE DEFAULT_WIN_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
-#DEFINE DEFAULT_WIN_ASL_BIN      = DEF(WIN_ASL_BIN)\r
-#DEFINE DEFAULT_WIN_ASL_FLAGS    = DEF(MS_ASL_FLAGS)\r
-#DEFINE DEFAULT_WIN_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
 \r
 DEFINE MSFT_ASLPP_FLAGS        = /nologo /E /C /FIAutoGen.h\r
 DEFINE MSFT_ASLCC_FLAGS        = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcpiTable\r
@@ -255,60 +249,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
-#   VS2008xASL  -win32-  Requires:\r
-#                             Microsoft Visual Studio 2008 Team Suite\r
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#   VS2010xASL  -win32-  Requires:\r
-#                             Microsoft Visual Studio 2010 Premium Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#   VS2012xASL  -win32-  Requires:\r
-#                             Microsoft Visual Studio 2012 Professional Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#   VS2013xASL  -win32-  Requires:\r
-#                             Microsoft Visual Studio 2013 Professional Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#   VS2015xASL  -win32-  Requires:\r
-#                             Microsoft Visual Studio 2015 Professional Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#   CYGGCCxASL  -win32-  Requires:\r
-#                             CygWin, GCC 4.3.0, binutils 2.20.51.0.5\r
-#                             Microsoft Visual Studio 2005 or 2008\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
 #   VS2008x86   -win64-  Requires:\r
 #                             Microsoft Visual Studio 2008 (x86)\r
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
@@ -344,41 +284,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler (iasl.exe) from\r
 #                               https://acpica.org/downloads\r
-#  VS2008x86xASL -win64- Requires:\r
-#                             Microsoft Visual Studio 2008 (x86)\r
-#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#  VS2010x86xASL -win64- Requires:\r
-#                             Microsoft Visual Studio 2010 (x86) Premium Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#  VS2012x86xASL -win64- Requires:\r
-#                             Microsoft Visual Studio 2012 (x86) Professional Edition\r
-#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#  VS2013x86xASL -win64- Requires:\r
-#                             Microsoft Visual Studio 2013 (x86) Professional\r
-#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-#  VS2015x86xASL -win64- Requires:\r
-#                             Microsoft Visual Studio 2015 (x86) Professional\r
-#                             Microsoft Windows Server 2003 Driver Development Kit(Microsoft WINDDK) version 3790.1830\r
-#                        Optional:\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-#                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
 #   RVCT        -win-   Requires:\r
 #                             ARM C/C++ Compiler, 5.00\r
 #                        Optional:\r
@@ -568,124 +473,6 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2008_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2008\r
-#\r
-#   VS2008  - Microsoft Visual Studio 2008 All Edition, including Standard, Professional, Express, TeamSuite\r
-#   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-#   VS2008xASL           - Microsoft Visual Studio 2008 ALL Edition, including Standard, Professional, Express, TeamSuite\r
-*_VS2008xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2008xASL_*_MAKE_PATH       = DEF(VS2008_BIN)\nmake.exe\r
-*_VS2008xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2008xASL_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe\r
-\r
-*_VS2008xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2008xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2008xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2008xASL_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2008xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2008xASL_*_ASL_FLAGS       =\r
-*_VS2008xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2008xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2008xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2008xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2008xASL_IA32_*_DLL        = DEF(VS2008_DLL)\r
-\r
-*_VS2008xASL_IA32_MAKE_PATH    = DEF(VS2008_BIN)\nmake.exe\r
-*_VS2008xASL_IA32_CC_PATH      = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_VFRPP_PATH   = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_SLINK_PATH   = DEF(VS2008_BIN)\lib.exe\r
-*_VS2008xASL_IA32_DLINK_PATH   = DEF(VS2008_BIN)\link.exe\r
-*_VS2008xASL_IA32_APP_PATH     = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_PP_PATH      = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_ASM_PATH     = DEF(VS2008_BIN)\ml.exe\r
-*_VS2008xASL_IA32_ASLCC_PATH    = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_ASLPP_PATH    = DEF(VS2008_BIN)\cl.exe\r
-*_VS2008xASL_IA32_ASLDLINK_PATH = DEF(VS2008_BIN)\link.exe\r
-\r
-      *_VS2008xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2008xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2008xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2008xASL_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2008xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2008xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2008xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2008xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2008xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2008xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2008xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2008xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2008xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2008xASL_X64_*_DLL         = DEF(VS2008_DLL)\r
-\r
-*_VS2008xASL_X64_CC_PATH       = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_PP_PATH       = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_APP_PATH      = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_VFRPP_PATH    = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_ASM_PATH      = DEF(VS2008_BINX64)\ml64.exe\r
-*_VS2008xASL_X64_SLINK_PATH    = DEF(VS2008_BINX64)\lib.exe\r
-*_VS2008xASL_X64_DLINK_PATH    = DEF(VS2008_BINX64)\link.exe\r
-*_VS2008xASL_X64_ASLCC_PATH    = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_ASLPP_PATH    = DEF(VS2008_BINX64)\cl.exe\r
-*_VS2008xASL_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe\r
-\r
-  DEBUG_VS2008xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2008xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2008xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2008xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2008xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2008xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2008xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2008xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2008xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2008xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2008xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2008xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2008xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2008xASL_EBC_*_DLL               = DEF(VS2008_DLL)\r
-\r
-*_VS2008xASL_EBC_MAKE_PATH           = DEF(VS2008_BIN)\nmake.exe\r
-*_VS2008xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2008xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
-*_VS2008xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2008xASL_EBC_SLINK_PATH          = DEF(VS2008_BIN)\link.exe\r
-*_VS2008xASL_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe\r
-\r
-*_VS2008xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2008xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2008xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2008xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2008xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2008x86       - Microsoft Visual Studio 2008 (x86) with Intel ASL\r
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)\r
@@ -802,120 +589,6 @@ NOOPT_VS2008x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2008x86_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#   VS2008x86xASL     - Microsoft Visual Studio 2008 with Microsoft ASL\r
-#   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-*_VS2008x86xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2008x86xASL_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe\r
-*_VS2008x86xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2008x86xASL_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe\r
-\r
-*_VS2008x86xASL_*_MAKE_FLAGS      = /nologo\r
-*_VS2008x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2008x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2008x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2008x86xASL_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2008x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2008x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)\r
-*_VS2008x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2008x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2008x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2008x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2008x86xASL_IA32_*_DLL        = DEF(VS2008x86_DLL)\r
-\r
-*_VS2008x86xASL_IA32_MAKE_PATH    = DEF(VS2008x86_BIN)\nmake.exe\r
-*_VS2008x86xASL_IA32_CC_PATH      = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_VFRPP_PATH   = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_ASLCC_PATH   = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_ASLPP_PATH   = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_SLINK_PATH   = DEF(VS2008x86_BIN)\lib.exe\r
-*_VS2008x86xASL_IA32_DLINK_PATH   = DEF(VS2008x86_BIN)\link.exe\r
-*_VS2008x86xASL_IA32_ASLDLINK_PATH= DEF(VS2008x86_BIN)\link.exe\r
-*_VS2008x86xASL_IA32_APP_PATH     = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_PP_PATH      = DEF(VS2008x86_BIN)\cl.exe\r
-*_VS2008x86xASL_IA32_ASM_PATH     = DEF(VS2008x86_BIN)\ml.exe\r
-\r
-      *_VS2008x86xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2008x86xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2008x86xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2008x86xASL_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2008x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2008x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2008x86xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2008xASL_IA32_NASM_FLAGS     = -Ox -f win32 -g\r
-RELEASE_VS2008xASL_IA32_NASM_FLAGS     = -Ox -f win32\r
-NOOPT_VS2008xASL_IA32_NASM_FLAGS       = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2008x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2008x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2008x86xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2008x86xASL_X64_*_DLL         = DEF(VS2008x86_DLL)\r
-\r
-*_VS2008x86xASL_X64_CC_PATH       = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_PP_PATH       = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_APP_PATH      = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_VFRPP_PATH    = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_ASLCC_PATH    = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_ASLPP_PATH    = DEF(VS2008x86_BINX64)\cl.exe\r
-*_VS2008x86xASL_X64_ASM_PATH      = DEF(VS2008x86_BINX64)\ml64.exe\r
-*_VS2008x86xASL_X64_SLINK_PATH    = DEF(VS2008x86_BINX64)\lib.exe\r
-*_VS2008x86xASL_X64_DLINK_PATH    = DEF(VS2008x86_BINX64)\link.exe\r
-*_VS2008x86xASL_X64_ASLDLINK_PATH = DEF(VS2008x86_BINX64)\link.exe\r
-\r
-  DEBUG_VS2008x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2008x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2008x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2008x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2008x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2008x86xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2008xASL_X64_NASM_FLAGS      = -Ox -f win64 -g\r
-RELEASE_VS2008xASL_X64_NASM_FLAGS      = -Ox -f win64\r
-NOOPT_VS2008xASL_X64_NASM_FLAGS        = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2008x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2008x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2008x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2008x86xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2008x86xASL_EBC_*_DLL               = DEF(VS2008x86_DLL)\r
-\r
-*_VS2008x86xASL_EBC_MAKE_PATH           = DEF(VS2008x86_BIN)\nmake.exe\r
-*_VS2008x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2008x86xASL_EBC_SLINK_PATH          = DEF(VS2008x86_BIN)\link.exe\r
-*_VS2008x86xASL_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe\r
-\r
-*_VS2008x86xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2008x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2008x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2008x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2008x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2008x86xASL_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 /ALIGN:32 /DRIVER\r
-\r
 \r
 ####################################################################################\r
 #\r
@@ -1035,124 +708,6 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2010_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2010\r
-#\r
-#   VS2010xASL  - Microsoft Visual Studio 2010 Premium Edition with Microsoft ASL\r
-#   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-#   VS2010xASL           - Microsoft Visual Studio 2010 Premium Edition\r
-*_VS2010xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2010xASL_*_MAKE_PATH       = DEF(VS2010_BIN)\nmake.exe\r
-*_VS2010xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2010xASL_*_RC_PATH         = DEF(WINSDK7_BIN)\rc.exe\r
-\r
-*_VS2010xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2010xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2010xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2010xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2010xASL_*_ASM16_PATH      = DEF(VS2010_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2010xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2010xASL_*_ASL_FLAGS       =\r
-*_VS2010xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2010xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2010xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2010xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2010xASL_IA32_*_DLL        = DEF(VS2010_DLL)\r
-\r
-*_VS2010xASL_IA32_MAKE_PATH    = DEF(VS2010_BIN)\nmake.exe\r
-*_VS2010xASL_IA32_CC_PATH      = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_VFRPP_PATH   = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_SLINK_PATH   = DEF(VS2010_BIN)\lib.exe\r
-*_VS2010xASL_IA32_DLINK_PATH   = DEF(VS2010_BIN)\link.exe\r
-*_VS2010xASL_IA32_APP_PATH     = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_PP_PATH      = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_ASM_PATH     = DEF(VS2010_BIN)\ml.exe\r
-*_VS2010xASL_IA32_ASLCC_PATH    = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_ASLPP_PATH    = DEF(VS2010_BIN)\cl.exe\r
-*_VS2010xASL_IA32_ASLDLINK_PATH = DEF(VS2010_BIN)\link.exe\r
-\r
-      *_VS2010xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2010xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2010xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2010xASL_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2010xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2010xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2010xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2010xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2010xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2010xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2010xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2010xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2010xASL_X64_*_DLL         = DEF(VS2010_DLL)\r
-\r
-*_VS2010xASL_X64_CC_PATH       = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_PP_PATH       = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_APP_PATH      = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_VFRPP_PATH    = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_ASM_PATH      = DEF(VS2010_BINX64)\ml64.exe\r
-*_VS2010xASL_X64_SLINK_PATH    = DEF(VS2010_BINX64)\lib.exe\r
-*_VS2010xASL_X64_DLINK_PATH    = DEF(VS2010_BINX64)\link.exe\r
-*_VS2010xASL_X64_ASLCC_PATH    = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_ASLPP_PATH    = DEF(VS2010_BINX64)\cl.exe\r
-*_VS2010xASL_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe\r
-\r
-  DEBUG_VS2010xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2010xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2010xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2010xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2010xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2010xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2010xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2010xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2010xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2010xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2010xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2010xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2010xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2010xASL_EBC_*_DLL               = DEF(VS2010_DLL)\r
-\r
-*_VS2010xASL_EBC_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe\r
-*_VS2010xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2010xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
-*_VS2010xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2010xASL_EBC_SLINK_PATH          = DEF(VS2010_BIN)\link.exe\r
-*_VS2010xASL_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe\r
-\r
-*_VS2010xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2010xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2010xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2010xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2010xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2010xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2010x86       - Microsoft Visual Studio 2010 (x86) with Intel ASL\r
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)\r
@@ -1269,121 +824,6 @@ NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010x86_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#   VS2010x86xASL     - Microsoft Visual Studio 2010 with Microsoft ASL\r
-#   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-*_VS2010x86xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2010x86xASL_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe\r
-*_VS2010x86xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2010x86xASL_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe\r
-\r
-*_VS2010x86xASL_*_MAKE_FLAGS      = /nologo\r
-*_VS2010x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2010x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2010x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2010x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2010x86xASL_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2010x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2010x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)\r
-*_VS2010x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2010x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2010x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2010x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2010x86xASL_IA32_*_DLL        = DEF(VS2010x86_DLL)\r
-\r
-*_VS2010x86xASL_IA32_MAKE_PATH    = DEF(VS2010x86_BIN)\nmake.exe\r
-*_VS2010x86xASL_IA32_CC_PATH      = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_VFRPP_PATH   = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_ASLCC_PATH   = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_ASLPP_PATH   = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_SLINK_PATH   = DEF(VS2010x86_BIN)\lib.exe\r
-*_VS2010x86xASL_IA32_DLINK_PATH   = DEF(VS2010x86_BIN)\link.exe\r
-*_VS2010x86xASL_IA32_ASLDLINK_PATH= DEF(VS2010x86_BIN)\link.exe\r
-*_VS2010x86xASL_IA32_APP_PATH     = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_PP_PATH      = DEF(VS2010x86_BIN)\cl.exe\r
-*_VS2010x86xASL_IA32_ASM_PATH     = DEF(VS2010x86_BIN)\ml.exe\r
-\r
-      *_VS2010x86xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2010x86xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2010x86xASL_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2010x86xASL_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2010x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2010x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2010x86xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2010x86xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2010x86xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2010x86xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2010x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2010x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2010x86xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2010x86xASL_X64_*_DLL         = DEF(VS2010x86_DLL)\r
-\r
-*_VS2010x86xASL_X64_CC_PATH       = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_PP_PATH       = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_APP_PATH      = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_VFRPP_PATH    = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_ASLCC_PATH    = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_ASLPP_PATH    = DEF(VS2010x86_BINX64)\cl.exe\r
-*_VS2010x86xASL_X64_ASM_PATH      = DEF(VS2010x86_BINX64)\ml64.exe\r
-*_VS2010x86xASL_X64_SLINK_PATH    = DEF(VS2010x86_BINX64)\lib.exe\r
-*_VS2010x86xASL_X64_DLINK_PATH    = DEF(VS2010x86_BINX64)\link.exe\r
-*_VS2010x86xASL_X64_ASLDLINK_PATH = DEF(VS2010x86_BINX64)\link.exe\r
-\r
-  DEBUG_VS2010x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2010x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2010x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2010x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2010x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2010x86xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2010x86xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2010x86xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2010x86xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2010x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2010x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2010x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2010x86xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2010x86xASL_EBC_*_DLL               = DEF(VS2010x86_DLL)\r
-\r
-*_VS2010x86xASL_EBC_MAKE_PATH           = DEF(VS2010x86_BIN)\nmake.exe\r
-*_VS2010x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2010x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
-*_VS2010x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2010x86xASL_EBC_SLINK_PATH          = DEF(VS2010x86_BIN)\link.exe\r
-*_VS2010x86xASL_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe\r
-\r
-*_VS2010x86xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2010x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2010x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2010x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2010x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2010x86xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #\r
 # Microsoft Visual Studio 2012\r
@@ -1502,124 +942,6 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2012\r
-#\r
-#   VS2012  - Microsoft Visual Studio 2012 Professional Edition with Microsoft ASL\r
-#   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-#   VS2012xASL           - Microsoft Visual Studio 2012 Professional Edition\r
-*_VS2012xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2012xASL_*_MAKE_PATH       = DEF(VS2012_BIN)\nmake.exe\r
-*_VS2012xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2012xASL_*_RC_PATH         = DEF(WINSDK71_BIN)\rc.exe\r
-\r
-*_VS2012xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2012xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2012xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2012xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2012xASL_*_ASM16_PATH      = DEF(VS2012_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2012xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2012xASL_*_ASL_FLAGS       =\r
-*_VS2012xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2012xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2012xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2012xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2012xASL_IA32_*_DLL        = DEF(VS2012_DLL)\r
-\r
-*_VS2012xASL_IA32_MAKE_PATH    = DEF(VS2012_BIN)\nmake.exe\r
-*_VS2012xASL_IA32_CC_PATH      = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_VFRPP_PATH   = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_SLINK_PATH   = DEF(VS2012_BIN)\lib.exe\r
-*_VS2012xASL_IA32_DLINK_PATH   = DEF(VS2012_BIN)\link.exe\r
-*_VS2012xASL_IA32_APP_PATH     = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_PP_PATH      = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_ASM_PATH     = DEF(VS2012_BIN)\ml.exe\r
-*_VS2012xASL_IA32_ASLCC_PATH    = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_ASLPP_PATH    = DEF(VS2012_BIN)\cl.exe\r
-*_VS2012xASL_IA32_ASLDLINK_PATH = DEF(VS2012_BIN)\link.exe\r
-\r
-      *_VS2012xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2012xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2012xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2012xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2012xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2012xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2012xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2012xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2012xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2012xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2012xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2012xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2012xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2012xASL_X64_*_DLL         = DEF(VS2012_DLL)\r
-\r
-*_VS2012xASL_X64_CC_PATH       = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_PP_PATH       = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_APP_PATH      = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_VFRPP_PATH    = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_ASM_PATH      = DEF(VS2012_BINX64)\ml64.exe\r
-*_VS2012xASL_X64_SLINK_PATH    = DEF(VS2012_BINX64)\lib.exe\r
-*_VS2012xASL_X64_DLINK_PATH    = DEF(VS2012_BINX64)\link.exe\r
-*_VS2012xASL_X64_ASLCC_PATH    = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_ASLPP_PATH    = DEF(VS2012_BINX64)\cl.exe\r
-*_VS2012xASL_X64_ASLDLINK_PATH = DEF(VS2012_BINX64)\link.exe\r
-\r
-  DEBUG_VS2012xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2012xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2012xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2012xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2012xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2012xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2012xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2012xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2012xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2012xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2012xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2012xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2012xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2012xASL_EBC_*_DLL               = DEF(VS2012_DLL)\r
-\r
-*_VS2012xASL_EBC_MAKE_PATH           = DEF(VS2012_BIN)\nmake.exe\r
-*_VS2012xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2012xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
-*_VS2012xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2012xASL_EBC_SLINK_PATH          = DEF(VS2012_BIN)\link.exe\r
-*_VS2012xASL_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe\r
-\r
-*_VS2012xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2012xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2012xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2012xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2012xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2012xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2012x86       - Microsoft Visual Studio 2012 (x86) professional with Intel ASL\r
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)\r
@@ -1736,120 +1058,6 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012x86_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#   VS2012x86xASL     - Microsoft Visual Studio 2012 (x86) professional with Microsoft ASL\r
-#   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-*_VS2012x86xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2012x86xASL_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe\r
-*_VS2012x86xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2012x86xASL_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe\r
-\r
-*_VS2012x86xASL_*_MAKE_FLAGS      = /nologo\r
-*_VS2012x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2012x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2012x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2012x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2012x86xASL_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2012x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2012x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)\r
-*_VS2012x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2012x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2012x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2012x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2012x86xASL_IA32_*_DLL        = DEF(VS2012x86_DLL)\r
-\r
-*_VS2012x86xASL_IA32_MAKE_PATH    = DEF(VS2012x86_BIN)\nmake.exe\r
-*_VS2012x86xASL_IA32_CC_PATH      = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_VFRPP_PATH   = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_ASLCC_PATH   = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_ASLPP_PATH   = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_SLINK_PATH   = DEF(VS2012x86_BIN)\lib.exe\r
-*_VS2012x86xASL_IA32_DLINK_PATH   = DEF(VS2012x86_BIN)\link.exe\r
-*_VS2012x86xASL_IA32_ASLDLINK_PATH= DEF(VS2012x86_BIN)\link.exe\r
-*_VS2012x86xASL_IA32_APP_PATH     = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_PP_PATH      = DEF(VS2012x86_BIN)\cl.exe\r
-*_VS2012x86xASL_IA32_ASM_PATH     = DEF(VS2012x86_BIN)\ml.exe\r
-\r
-      *_VS2012x86xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2012x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2012x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2012x86xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2012x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2012x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2012x86xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2012x86xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2012x86xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2012x86xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2012x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2012x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2012x86xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2012x86xASL_X64_*_DLL         = DEF(VS2012x86_DLL)\r
-\r
-*_VS2012x86xASL_X64_CC_PATH       = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_PP_PATH       = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_APP_PATH      = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_VFRPP_PATH    = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_ASLCC_PATH    = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_ASLPP_PATH    = DEF(VS2012x86_BINX64)\cl.exe\r
-*_VS2012x86xASL_X64_ASM_PATH      = DEF(VS2012x86_BINX64)\ml64.exe\r
-*_VS2012x86xASL_X64_SLINK_PATH    = DEF(VS2012x86_BINX64)\lib.exe\r
-*_VS2012x86xASL_X64_DLINK_PATH    = DEF(VS2012x86_BINX64)\link.exe\r
-*_VS2012x86xASL_X64_ASLDLINK_PATH = DEF(VS2012x86_BINX64)\link.exe\r
-\r
-  DEBUG_VS2012x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_VS2012x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_VS2012x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2012x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2012x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2012x86xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2012x86xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2012x86xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2012x86xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2012x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2012x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2012x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2012x86xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2012x86xASL_EBC_*_DLL               = DEF(VS2012x86_DLL)\r
-\r
-*_VS2012x86xASL_EBC_MAKE_PATH           = DEF(VS2012x86_BIN)\nmake.exe\r
-*_VS2012x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2012x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
-*_VS2012x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2012x86xASL_EBC_SLINK_PATH          = DEF(VS2012x86_BIN)\link.exe\r
-*_VS2012x86xASL_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe\r
-\r
-*_VS2012x86xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2012x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2012x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2012x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2012x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2012x86xASL_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 /ALIGN:32 /DRIVER\r
-\r
 ####################################################################################\r
 #\r
 # Microsoft Visual Studio 2013\r
@@ -1968,124 +1176,6 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2013\r
-#\r
-#   VS2013  - Microsoft Visual Studio 2013 Professional Edition with Microsoft ASL\r
-#   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-#   VS2013xASL           - Microsoft Visual Studio 2013 Professional Edition\r
-*_VS2013xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2013xASL_*_MAKE_PATH       = DEF(VS2013_BIN)\nmake.exe\r
-*_VS2013xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2013xASL_*_RC_PATH         = DEF(WINSDK8_BIN)\rc.exe\r
-\r
-*_VS2013xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2013xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2013xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2013xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2013xASL_*_ASM16_PATH      = DEF(VS2013_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2013xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2013xASL_*_ASL_FLAGS       =\r
-*_VS2013xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2013xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2013xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2013xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2013xASL_IA32_*_DLL        = DEF(VS2013_DLL)\r
-\r
-*_VS2013xASL_IA32_MAKE_PATH    = DEF(VS2013_BIN)\nmake.exe\r
-*_VS2013xASL_IA32_CC_PATH      = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_VFRPP_PATH   = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_SLINK_PATH   = DEF(VS2013_BIN)\lib.exe\r
-*_VS2013xASL_IA32_DLINK_PATH   = DEF(VS2013_BIN)\link.exe\r
-*_VS2013xASL_IA32_APP_PATH     = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_PP_PATH      = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_ASM_PATH     = DEF(VS2013_BIN)\ml.exe\r
-*_VS2013xASL_IA32_ASLCC_PATH    = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_ASLPP_PATH    = DEF(VS2013_BIN)\cl.exe\r
-*_VS2013xASL_IA32_ASLDLINK_PATH = DEF(VS2013_BIN)\link.exe\r
-\r
-      *_VS2013xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2013xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw\r
-RELEASE_VS2013xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2013xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2013xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2013xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2013xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2013xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2013xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2013xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2013xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2013xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2013xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2013xASL_X64_*_DLL         = DEF(VS2013_DLL)\r
-\r
-*_VS2013xASL_X64_CC_PATH       = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_PP_PATH       = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_APP_PATH      = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_VFRPP_PATH    = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_ASM_PATH      = DEF(VS2013_BINX64)\ml64.exe\r
-*_VS2013xASL_X64_SLINK_PATH    = DEF(VS2013_BINX64)\lib.exe\r
-*_VS2013xASL_X64_DLINK_PATH    = DEF(VS2013_BINX64)\link.exe\r
-*_VS2013xASL_X64_ASLCC_PATH    = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_ASLPP_PATH    = DEF(VS2013_BINX64)\cl.exe\r
-*_VS2013xASL_X64_ASLDLINK_PATH = DEF(VS2013_BINX64)\link.exe\r
-\r
-  DEBUG_VS2013xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Gw\r
-RELEASE_VS2013xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2013xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2013xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2013xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2013xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2013xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2013xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2013xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2013xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2013xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2013xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2013xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2013xASL_EBC_*_DLL               = DEF(VS2013_DLL)\r
-\r
-*_VS2013xASL_EBC_MAKE_PATH           = DEF(VS2013_BIN)\nmake.exe\r
-*_VS2013xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2013xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
-*_VS2013xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2013xASL_EBC_SLINK_PATH          = DEF(VS2013_BIN)\link.exe\r
-*_VS2013xASL_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe\r
-\r
-*_VS2013xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2013xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2013xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2013xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2013xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2013xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2013x86       - Microsoft Visual Studio 2013 (x86) professional with Intel ASL\r
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)\r
@@ -2202,121 +1292,6 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013x86_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#   VS2013x86xASL     - Microsoft Visual Studio 2013 (x86) professional with Microsoft ASL\r
-#   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-*_VS2013x86xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2013x86xASL_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe\r
-*_VS2013x86xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2013x86xASL_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe\r
-\r
-*_VS2013x86xASL_*_MAKE_FLAGS      = /nologo\r
-*_VS2013x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2013x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2013x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2013x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
-*_VS2013x86xASL_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2013x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2013x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)\r
-*_VS2013x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2013x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2013x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2013x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2013x86xASL_IA32_*_DLL        = DEF(VS2013x86_DLL)\r
-\r
-*_VS2013x86xASL_IA32_MAKE_PATH    = DEF(VS2013x86_BIN)\nmake.exe\r
-*_VS2013x86xASL_IA32_CC_PATH      = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_VFRPP_PATH   = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_ASLCC_PATH   = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_ASLPP_PATH   = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_SLINK_PATH   = DEF(VS2013x86_BIN)\lib.exe\r
-*_VS2013x86xASL_IA32_DLINK_PATH   = DEF(VS2013x86_BIN)\link.exe\r
-*_VS2013x86xASL_IA32_ASLDLINK_PATH= DEF(VS2013x86_BIN)\link.exe\r
-*_VS2013x86xASL_IA32_APP_PATH     = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_PP_PATH      = DEF(VS2013x86_BIN)\cl.exe\r
-*_VS2013x86xASL_IA32_ASM_PATH     = DEF(VS2013x86_BIN)\ml.exe\r
-\r
-      *_VS2013x86xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2013x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw\r
-RELEASE_VS2013x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2013x86xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2013x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2013x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2013x86xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2013x86xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2013x86xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2013x86xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2013x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2013x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2013x86xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2013x86xASL_X64_*_DLL         = DEF(VS2013x86_DLL)\r
-\r
-*_VS2013x86xASL_X64_CC_PATH       = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_PP_PATH       = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_APP_PATH      = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_VFRPP_PATH    = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_ASLCC_PATH    = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_ASLPP_PATH    = DEF(VS2013x86_BINX64)\cl.exe\r
-*_VS2013x86xASL_X64_ASM_PATH      = DEF(VS2013x86_BINX64)\ml64.exe\r
-*_VS2013x86xASL_X64_SLINK_PATH    = DEF(VS2013x86_BINX64)\lib.exe\r
-*_VS2013x86xASL_X64_DLINK_PATH    = DEF(VS2013x86_BINX64)\link.exe\r
-*_VS2013x86xASL_X64_ASLDLINK_PATH = DEF(VS2013x86_BINX64)\link.exe\r
-\r
-  DEBUG_VS2013x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Gw\r
-RELEASE_VS2013x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2013x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2013x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2013x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2013x86xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2013x86xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2013x86xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2013x86xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2013x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2013x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2013x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2013x86xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2013x86xASL_EBC_*_DLL               = DEF(VS2013x86_DLL)\r
-\r
-*_VS2013x86xASL_EBC_MAKE_PATH           = DEF(VS2013x86_BIN)\nmake.exe\r
-*_VS2013x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2013x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
-*_VS2013x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2013x86xASL_EBC_SLINK_PATH          = DEF(VS2013x86_BIN)\link.exe\r
-*_VS2013x86xASL_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe\r
-\r
-*_VS2013x86xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2013x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2013x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2013x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2013x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2013x86xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #\r
 # Microsoft Visual Studio 2015\r
@@ -2436,125 +1411,6 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Microsoft Visual Studio 2015\r
-#\r
-#   VS2015  - Microsoft Visual Studio 2015 Professional Edition with Microsoft ASL\r
-#   ASL     - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-#   VS2015xASL           - Microsoft Visual Studio 2015 Professional Edition\r
-*_VS2015xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2015xASL_*_MAKE_PATH       = DEF(VS2015_BIN)\nmake.exe\r
-*_VS2015xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2015xASL_*_RC_PATH         = DEF(WINSDK81_BIN)\rc.exe\r
-\r
-*_VS2015xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2015xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2015xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2015xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2015xASL_*_DLINK2_FLAGS    =\r
-\r
-*_VS2015xASL_*_ASM16_PATH      = DEF(VS2015_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2015xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2015xASL_*_ASL_FLAGS       =\r
-*_VS2015xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2015xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2015xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2015xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2015xASL_IA32_*_DLL        = DEF(VS2015_DLL)\r
-\r
-*_VS2015xASL_IA32_MAKE_PATH    = DEF(VS2015_BIN)\nmake.exe\r
-*_VS2015xASL_IA32_CC_PATH      = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_VFRPP_PATH   = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_SLINK_PATH   = DEF(VS2015_BIN)\lib.exe\r
-*_VS2015xASL_IA32_DLINK_PATH   = DEF(VS2015_BIN)\link.exe\r
-*_VS2015xASL_IA32_APP_PATH     = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_PP_PATH      = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_ASM_PATH     = DEF(VS2015_BIN)\ml.exe\r
-*_VS2015xASL_IA32_ASLCC_PATH    = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_ASLPP_PATH    = DEF(VS2015_BIN)\cl.exe\r
-*_VS2015xASL_IA32_ASLDLINK_PATH = DEF(VS2015_BIN)\link.exe\r
-\r
-      *_VS2015xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2015xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw\r
-RELEASE_VS2015xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2015xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2015xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2015xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2015xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2015xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2015xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2015xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2015xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2015xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2015xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2015xASL_X64_*_DLL         = DEF(VS2015_DLL)\r
-\r
-*_VS2015xASL_X64_CC_PATH       = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_PP_PATH       = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_APP_PATH      = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_VFRPP_PATH    = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_ASM_PATH      = DEF(VS2015_BINX64)\ml64.exe\r
-*_VS2015xASL_X64_SLINK_PATH    = DEF(VS2015_BINX64)\lib.exe\r
-*_VS2015xASL_X64_DLINK_PATH    = DEF(VS2015_BINX64)\link.exe\r
-*_VS2015xASL_X64_ASLCC_PATH    = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_ASLPP_PATH    = DEF(VS2015_BINX64)\cl.exe\r
-*_VS2015xASL_X64_ASLDLINK_PATH = DEF(VS2015_BINX64)\link.exe\r
-\r
-  DEBUG_VS2015xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Gw\r
-RELEASE_VS2015xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2015xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2015xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2015xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2015xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2015xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2015xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2015xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2015xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2015xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2015xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2015xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2015xASL_EBC_*_DLL               = DEF(VS2015_DLL)\r
-\r
-*_VS2015xASL_EBC_MAKE_PATH           = DEF(VS2015_BIN)\nmake.exe\r
-*_VS2015xASL_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2015xASL_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
-*_VS2015xASL_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
-*_VS2015xASL_EBC_SLINK_PATH          = DEF(VS2015_BIN)\link.exe\r
-*_VS2015xASL_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe\r
-\r
-*_VS2015xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2015xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2015xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2015xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2015xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2015xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2015x86       - Microsoft Visual Studio 2015 (x86) professional with Intel ASL\r
 #   ASL  - Intel ACPI Source Language Compiler (iasl.exe)\r
@@ -2672,122 +1528,6 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_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 /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#   VS2015x86xASL     - Microsoft Visual Studio 2015 (x86) professional with Microsoft ASL\r
-#   ASL  - Microsoft ACPI Source Language Compiler (asl.exe)\r
-####################################################################################\r
-*_VS2015x86xASL_*_*_FAMILY        = MSFT\r
-\r
-*_VS2015x86xASL_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe\r
-*_VS2015x86xASL_*_MAKE_FLAG       = /nologo\r
-*_VS2015x86xASL_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe\r
-\r
-*_VS2015x86xASL_*_MAKE_FLAGS      = /nologo\r
-*_VS2015x86xASL_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2015x86xASL_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2015x86xASL_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2015x86xASL_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2015x86xASL_*_DLINK2_FLAGS    =\r
-\r
-*_VS2015x86xASL_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_VS2015x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)\r
-*_VS2015x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)\r
-*_VS2015x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)\r
-*_VS2015x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2015x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2015x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_VS2015x86xASL_IA32_*_DLL        = DEF(VS2015x86_DLL)\r
-\r
-*_VS2015x86xASL_IA32_MAKE_PATH    = DEF(VS2015x86_BIN)\nmake.exe\r
-*_VS2015x86xASL_IA32_CC_PATH      = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_VFRPP_PATH   = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_ASLCC_PATH   = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_ASLPP_PATH   = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_SLINK_PATH   = DEF(VS2015x86_BIN)\lib.exe\r
-*_VS2015x86xASL_IA32_DLINK_PATH   = DEF(VS2015x86_BIN)\link.exe\r
-*_VS2015x86xASL_IA32_ASLDLINK_PATH= DEF(VS2015x86_BIN)\link.exe\r
-*_VS2015x86xASL_IA32_APP_PATH     = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_PP_PATH      = DEF(VS2015x86_BIN)\cl.exe\r
-*_VS2015x86xASL_IA32_ASM_PATH     = DEF(VS2015x86_BIN)\ml.exe\r
-\r
-      *_VS2015x86xASL_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2015x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw\r
-RELEASE_VS2015x86xASL_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2015x86xASL_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
-\r
-  DEBUG_VS2015x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2015x86xASL_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-NOOPT_VS2015x86xASL_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-\r
-  DEBUG_VS2015x86xASL_IA32_NASM_FLAGS  = -Ox -f win32 -g\r
-RELEASE_VS2015x86xASL_IA32_NASM_FLAGS  = -Ox -f win32\r
-NOOPT_VS2015x86xASL_IA32_NASM_FLAGS    = -O0 -f win32 -g\r
-\r
-  DEBUG_VS2015x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2015x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2015x86xASL_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-*_VS2015x86xASL_X64_*_DLL         = DEF(VS2015x86_DLL)\r
-\r
-*_VS2015x86xASL_X64_CC_PATH       = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_PP_PATH       = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_APP_PATH      = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_VFRPP_PATH    = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_ASLCC_PATH    = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_ASLPP_PATH    = DEF(VS2015x86_BINX64)\cl.exe\r
-*_VS2015x86xASL_X64_ASM_PATH      = DEF(VS2015x86_BINX64)\ml64.exe\r
-*_VS2015x86xASL_X64_SLINK_PATH    = DEF(VS2015x86_BINX64)\lib.exe\r
-*_VS2015x86xASL_X64_DLINK_PATH    = DEF(VS2015x86_BINX64)\link.exe\r
-*_VS2015x86xASL_X64_ASLDLINK_PATH = DEF(VS2015x86_BINX64)\link.exe\r
-\r
-  DEBUG_VS2015x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Gw\r
-RELEASE_VS2015x86xASL_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
-NOOPT_VS2015x86xASL_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-\r
-  DEBUG_VS2015x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_VS2015x86xASL_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_VS2015x86xASL_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-\r
-  DEBUG_VS2015x86xASL_X64_NASM_FLAGS   = -Ox -f win64 -g\r
-RELEASE_VS2015x86xASL_X64_NASM_FLAGS   = -Ox -f win64\r
-NOOPT_VS2015x86xASL_X64_NASM_FLAGS     = -O0 -f win64 -g\r
-\r
-  DEBUG_VS2015x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_VS2015x86xASL_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_VS2015x86xASL_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_VS2015x86xASL_EBC_*_FAMILY            = INTEL\r
-*_VS2015x86xASL_EBC_*_DLL               = DEF(VS2015x86_DLL)\r
-\r
-*_VS2015x86xASL_EBC_MAKE_PATH           = DEF(VS2015x86_BIN)\nmake.exe\r
-*_VS2015x86xASL_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2015x86xASL_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
-*_VS2015x86xASL_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
-*_VS2015x86xASL_EBC_SLINK_PATH          = DEF(VS2015x86_BIN)\link.exe\r
-*_VS2015x86xASL_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe\r
-\r
-*_VS2015x86xASL_EBC_MAKE_FLAGS          = /nologo\r
-*_VS2015x86xASL_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
-*_VS2015x86xASL_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_VS2015x86xASL_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_VS2015x86xASL_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC\r
-*_VS2015x86xASL_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 /ALIGN:32 /DRIVER\r
-\r
-\r
 ####################################################################################\r
 #   VS2017       - Microsoft Visual Studio 2017 with Intel ASL\r
 #   ASL          - Intel ACPI Source Language Compiler (iasl.exe)\r