X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Vlv2TbltDevicePkg%2Fbld_vlv.bat;h=27bc4e7c41be27ada7e373c295e0543bee8a3674;hb=ba0014b9f8ae1a593f03e744f26008214c2b06a8;hp=b9c86e356952b7962e6f853ac980348453b35844;hpb=3cbfba02fef9dae07a041fdbf2e89611d72d6f90;p=mirror_edk2.git diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat index b9c86e3569..27bc4e7c41 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 @@ -20,8 +20,8 @@ echo. ::********************************************************************** :: Initial Setup ::********************************************************************** -set WORKSPACE=%CD% -if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1% +REM set WORKSPACE=%CD% +REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1% set /a build_threads=1 set "Build_Flags= " set exitCode=0 @@ -29,13 +29,14 @@ 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 if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db -if exist conf\.cache rmdir /q/s conf\.cache +if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache :: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf :: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding @@ -47,7 +48,7 @@ set PLATFORM_PACKAGE=Vlv2TbltDevicePkg set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt -set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg +REM set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg ::create new AutoPlatformCFG.txt file copy /y nul %auto_config_inc% >nul @@ -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. @@ -96,17 +109,17 @@ if "%~1"=="" goto Usage ::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\ if "%Arch%"=="IA32" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc% ) else if "%Arch%"=="X64" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc% ) :: -- Build flags settings for each Platform -- echo Setting %1 platform configuration and BIOS ID... if /i "%~1" == "MNW2" ( - echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env + echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc% ) else ( @@ -117,60 +130,81 @@ set Platform_Type=%~1 if /i "%~2" == "RELEASE" ( set target=RELEASE - echo BUILD_TYPE = R >> Conf\BiosId.env + echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env ) else ( set target=DEBUG - echo BUILD_TYPE = D >> Conf\BiosId.env + echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env ) ::********************************************************************** :: 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\" ( - set TOOL_CHAIN_TAG=VS2008 - ) else ( - set TOOL_CHAIN_TAG=VS2008x86 - ) - ) else if defined VS100COMNTOOLS ( +echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013... +if defined VS140COMNTOOLS ( + if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat" + if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" ( + set TOOL_CHAIN_TAG=VS2015 + ) else ( + set TOOL_CHAIN_TAG=VS2015x86 + ) +) 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 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 VS100COMNTOOLS ( 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 ( + ) else ( set TOOL_CHAIN_TAG=VS2010x86 - ) + ) +) else 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 + ) ) else ( - echo --ERROR: VS2008/VS2010 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS not defined ^^! - echo. - goto :BldFail + echo --ERROR: VS2008/VS2010/VS2012/VS2013/VS2015 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS/VS140COMMONTOOLS not defined ^^! + echo. + goto :BldFail ) echo Ensuring correct build directory is present for GenBiosId... -set BUILD_PATH=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG% +set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG% echo Modifing Conf files for this build... :: Remove lines with these tags from target.txt -findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp +findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp -echo TARGET = %TARGET% >> Conf\target.txt.tmp +echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp if "%Arch%"=="IA32" ( - echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp + echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp ) else if "%Arch%"=="X64" ( - echo TARGET_ARCH = IA32 X64 >> Conf\target.txt.tmp + echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp ) -echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Conf\target.txt.tmp -echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp +echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp +echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp if %Source% == 0 ( - echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> Conf\target.txt.tmp + echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp ) else ( - echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> Conf\target.txt.tmp + echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp ) -echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> Conf\target.txt.tmp +echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp -move /Y Conf\target.txt.tmp Conf\target.txt >nul +move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul ::********************************************************************** :: Build BIOS @@ -178,11 +212,11 @@ move /Y Conf\target.txt.tmp Conf\target.txt >nul echo Creating BiosId... pushd %PLATFORM_PACKAGE% -if not exist ..\%BUILD_PATH%\IA32 mkdir ..\%BUILD_PATH%\IA32 - GenBiosId.exe -i ..\Conf\BiosId.env -o ..\%BUILD_PATH%\IA32\BiosId.bin -ob ..\Conf\BiosId.bat +if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32 + GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat if "%Arch%"=="X64" ( - if not exist ..\%BUILD_PATH%\X64 mkdir ..\%BUILD_PATH%\X64 - GenBiosId.exe -i ..\Conf\BiosId.env -o ..\%BUILD_PATH%\X64\BiosId.bin -ob ..\Conf\BiosId.bat + if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64 + GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat ) popd @@ -191,7 +225,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 +237,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 @@ -214,12 +248,13 @@ if %ERRORLEVEL% NEQ 0 goto BldFail ::echo FD successfully updated with default Hii values. :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables -find /v "#" Conf\BiosId.env > ver_strings +find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j 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 +262,16 @@ echo BIOS ROM Created: %BIOS_Name% echo. echo -------------------- The EDKII BIOS build has successfully completed. -------------------- echo. + +@REM build capsule here +if "%openssl_path%" == "" ( + echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated. + set exitCode=1 + goto Exit +) +echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv +build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc + goto Exit :Usage @@ -237,6 +282,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.