UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 4b5256ab6e93eda8787f4ad0ecc5b5b090d764fd..58fd26a4b585ab0ffce782d4974bc978cb48a767 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -227,7 +227,7 @@ if NOT exist %CONF_PATH% (
 ) else (\r
   if defined RECONFIG (\r
     echo.\r
-    echo  Over-writing the files in the CONF_PATH directory\r
+    echo  Overwriting the files in the CONF_PATH directory\r
     echo  using the default template files\r
     echo.\r
   )\r
@@ -240,7 +240,7 @@ if NOT exist %CONF_PATH%\target.txt (
   )\r
   copy %EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul\r
 ) else (\r
-  if defined RECONFIG echo over-write ... target.template to %CONF_PATH%\target.txt\r
+  if defined RECONFIG echo overwrite ... target.template to %CONF_PATH%\target.txt\r
   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\target.template %CONF_PATH%\target.txt > nul\r
 )\r
 \r
@@ -251,7 +251,7 @@ if NOT exist %CONF_PATH%\tools_def.txt (
   )\r
   copy %EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt > nul\r
 ) else (\r
-  if defined RECONFIG echo over-write ... tools_def.template to %CONF_PATH%\tools_def.txt\r
+  if defined RECONFIG echo overwrite ... tools_def.template to %CONF_PATH%\tools_def.txt\r
   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %CONF_PATH%\tools_def.txt > nul\r
 )\r
 \r
@@ -299,7 +299,6 @@ IF NOT EXIST "%EDK_TOOLS_BIN%\GenFfs.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFv.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenFw.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\GenSec.exe" goto check_c_tools\r
-IF NOT EXIST "%EDK_TOOLS_BIN%\Split.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\TianoCompress.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\VfrCompile.exe" goto check_c_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\VolInfo.exe" goto check_c_tools\r
@@ -402,6 +401,8 @@ goto end
   if %ERRORLEVEL% EQU 0 (\r
     goto use_pip_basetools\r
   ) else (\r
+    REM reset ERRORLEVEL\r
+    type nul>nul\r
     goto use_builtin_basetools\r
   )\r
 \r