X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Vlv2TbltDevicePkg%2Fbld_vlv.bat;h=a1d8c5b5257f51cc809f90b747fa98b749d63049;hp=b9c86e356952b7962e6f853ac980348453b35844;hb=7a0e4f8e430461afc49a6d69fa081cf522fa46fe;hpb=3cbfba02fef9dae07a041fdbf2e89611d72d6f90
diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index b9c86e3569..a1d8c5b525 100644
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -1,7 +1,7 @@
@REM @file
@REM Windows batch file to build BIOS ROM
@REM
-@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
@REM This program and the accompanying materials
@REM are licensed and made available under the terms and conditions of the BSD License
@REM which accompanies this distribution. The full text of the license may be found at
@@ -29,7 +29,8 @@ set Arch=X64
set Source=0
:: Clean up previous build files.
-if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
+if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log
+if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
@@ -61,18 +62,30 @@ copy /y nul %auto_config_inc% >nul
if /i "%~1"=="/?" goto Usage
if /i "%~1"=="/l" (
- set Build_Flags=%Build_Flags% -j EDK2.log
+ set Build_Flags=%Build_Flags% -j %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log
+ shift
+ goto OptLoop
+)
+if /i "%~1"=="/y" (
+ set Build_Flags=%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
+ shift
+ goto OptLoop
+)
+if /i "%~1"=="/m" (
+ if defined NUMBER_OF_PROCESSORS (
+ set /a build_threads=%NUMBER_OF_PROCESSORS%+1
+ )
shift
goto OptLoop
)
if /i "%~1" == "/c" (
echo Removing previous build files ...
if exist build (
- del /f/s/q build > null
+ del /f/s/q build > nul
rmdir /s/q build
)
if exist conf\.cache (
- del /f/s/q conf\.cache > null
+ del /f/s/q conf\.cache > nul
rmdir /s/q conf\.cache
)
echo.
@@ -124,13 +137,13 @@ if /i "%~2" == "RELEASE" (
)
::**********************************************************************
-:: Additional EDK Build Setup/Configuration
-::**********************************************************************
-echo.
-echo Setting the Build environment for VS2008/VS2010...
-if defined VS90COMNTOOLS (
- if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"
- if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (
+:: Additional EDK Build Setup/Configuration
+::**********************************************************************
+echo.
+echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...
+if defined VS90COMNTOOLS (
+ if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"
+ if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (
set TOOL_CHAIN_TAG=VS2008
) else (
set TOOL_CHAIN_TAG=VS2008x86
@@ -139,14 +152,28 @@ if defined VS90COMNTOOLS (
if not defined VSINSTALLDIR call "%VS100COMNTOOLS%\vsvars32.bat"
if /I "%VS100COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\" (
set TOOL_CHAIN_TAG=VS2010
-) else (
- set TOOL_CHAIN_TAG=VS2010x86
- )
-) else (
- echo --ERROR: VS2008/VS2010 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS not defined ^^!
- echo.
- goto :BldFail
-)
+ ) else (
+ set TOOL_CHAIN_TAG=VS2010x86
+ )
+) else if defined VS110COMNTOOLS (
+ if not defined VSINSTALLDIR call "%VS110COMNTOOLS%\vsvars32.bat"
+ if /I "%VS110COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 11.0\Common7\Tools\" (
+ set TOOL_CHAIN_TAG=VS2012
+ ) else (
+ set TOOL_CHAIN_TAG=VS2012x86
+ )
+) else if defined VS120COMNTOOLS (
+ if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
+ if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (
+ set TOOL_CHAIN_TAG=VS2013
+ ) else (
+ set TOOL_CHAIN_TAG=VS2013x86
+ )
+) else (
+ echo --ERROR: VS2008/VS2010/VS2012/VS2013 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!
+ echo.
+ goto :BldFail
+)
echo Ensuring correct build directory is present for GenBiosId...
set BUILD_PATH=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%
@@ -191,7 +218,7 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
echo.
echo Invoking EDK2 build...
-build %Build_Flags%
+call build %Build_Flags%
if %ERRORLEVEL% NEQ 0 goto BldFail
@@ -203,10 +230,10 @@ echo Running fce...
pushd %PLATFORM_PACKAGE%
:: Extract Hii data from build and store in HiiDefaultData.txt
-fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt 1>>EDK2.log 2>&1
+fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt
-:: copy the Setup variable to the SetupDefault variable and save changes to VlvXXX.fd
-fce mirror -i ..\%BUILD_PATH%\FV\Vlv.fd -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd Setup SetupDefault 1>>EDK2.log 2>&1
+:: save changes to VlvXXX.fd
+fce update -i ..\%BUILD_PATH%\FV\Vlv.fd -s ..\%BUILD_PATH%\FV\HiiDefaultData.txt -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd
popd
@@ -220,6 +247,7 @@ del /f/q ver_strings >nul
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BIOS_Name% >nul
+copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %BUILD_PATH%\FV\Vlv.ROM >nul
echo.
echo Build location: %BUILD_PATH%
@@ -227,6 +255,12 @@ echo BIOS ROM Created: %BIOS_Name%
echo.
echo -------------------- The EDKII BIOS build has successfully completed. --------------------
echo.
+
+@REM build capsule here
+if "%openssl_path%" == "" goto Exit
+echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
+build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+
goto Exit
:Usage
@@ -237,6 +271,9 @@ echo.
echo Usage: bld_vlv.bat [options] PlatformType [Build Target]
echo.
echo /c CleanAll before building
+echo /l Generate build log file
+echo /y Generate build report file
+echo /m Enable multi-processor build
echo /IA32 Set Arch to IA32 (default: X64)
echo /X64 Set Arch to X64 (default: X64)
echo.