Vlv2TbltDevicePkg: Add /m flag for multi-processor build

[mirror_edk2.git] / Vlv2TbltDevicePkg / bld_vlv.bat

diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index fc97f425342598e90e0f79dc80a0829b98ff7262..a1d8c5b5257f51cc809f90b747fa98b749d63049 100644 (file)
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to build BIOS ROM\r
 @REM\r
-@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 @REM This program and the accompanying materials\r
 @REM are licensed and made available under the terms and conditions of the BSD License\r
 @REM which accompanies this distribution.  The full text of the license may be found at\r
@@ -29,7 +29,8 @@ set Arch=X64
 set Source=0\r
 \r
 :: Clean up previous build files.\r
-if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log\r
+if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log\r
+if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report\r
 if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log\r
 if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt\r
 if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt\r
@@ -61,18 +62,30 @@ copy /y nul %auto_config_inc% >nul
 if /i "%~1"=="/?" goto Usage\r
 \r
 if /i "%~1"=="/l" (\r
-    set Build_Flags=%Build_Flags% -j EDK2.log\r
+    set Build_Flags=%Build_Flags% -j %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log\r
+    shift\r
+    goto OptLoop\r
+)\r
+if /i "%~1"=="/y" (\r
+    set Build_Flags=%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report\r
+    shift\r
+    goto OptLoop\r
+)\r
+if /i "%~1"=="/m" (\r
+    if defined NUMBER_OF_PROCESSORS (\r
+        set /a build_threads=%NUMBER_OF_PROCESSORS%+1\r
+    )\r
     shift\r
     goto OptLoop\r
 )\r
 if /i "%~1" == "/c" (\r
     echo Removing previous build files ...\r
     if exist build (\r
-        del /f/s/q build > null\r
+        del /f/s/q build > nul\r
         rmdir /s/q build\r
     )\r
     if exist conf\.cache (\r
-        del /f/s/q conf\.cache > null\r
+        del /f/s/q conf\.cache > nul\r
         rmdir /s/q conf\.cache\r
     )\r
     echo.\r
@@ -205,7 +218,7 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
 \r
 echo.\r
 echo Invoking EDK2 build...\r
-build %Build_Flags%\r
+call build %Build_Flags%\r
 \r
 if %ERRORLEVEL% NEQ 0 goto BldFail\r
 \r
@@ -217,10 +230,10 @@ echo Running fce...
 \r
 pushd %PLATFORM_PACKAGE%\r
 :: Extract Hii data from build and store in HiiDefaultData.txt\r
-fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt 1>>EDK2.log 2>&1\r
+fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt\r
 \r
-:: copy the Setup variable to the SetupDefault variable and save changes to VlvXXX.fd\r
-fce mirror -i ..\%BUILD_PATH%\FV\Vlv.fd -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd Setup SetupDefault 1>>EDK2.log 2>&1\r
+:: save changes to VlvXXX.fd\r
+fce update -i ..\%BUILD_PATH%\FV\Vlv.fd -s ..\%BUILD_PATH%\FV\HiiDefaultData.txt -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd\r
 \r
 popd\r
 \r
@@ -234,6 +247,7 @@ del /f/q ver_strings >nul
 \r
 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
 copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %WORKSPACE%\%BIOS_Name% >nul\r
+copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %BUILD_PATH%\FV\Vlv.ROM >nul\r
 \r
 echo.\r
 echo Build location:     %BUILD_PATH%\r
@@ -241,6 +255,12 @@ echo BIOS ROM Created:   %BIOS_Name%
 echo.\r
 echo -------------------- The EDKII BIOS build has successfully completed. --------------------\r
 echo.\r
+\r
+@REM build capsule here\r
+if "%openssl_path%" == "" goto Exit\r
+echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
+build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
+\r
 goto Exit\r
 \r
 :Usage\r
@@ -251,6 +271,9 @@ echo.
 echo Usage: bld_vlv.bat [options] PlatformType [Build Target]\r
 echo.\r
 echo    /c    CleanAll before building\r
+echo    /l    Generate build log file\r
+echo    /y    Generate build report file\r
+echo    /m    Enable multi-processor build\r
 echo    /IA32 Set Arch to IA32 (default: X64)\r
 echo    /X64  Set Arch to X64 (default: X64)\r
 echo.\r