tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vlv2TbltDevicePkg: Fix build scripts 

https://bugzilla.tianocore.org/show_bug.cgi?id=911

Update build scripts to work with edk2 and Vlv2Binaries
in PACKAGES_PATH.

Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>
Reviewed-by: Guo Mang <mang.guo@intel.com>
This commit is contained in:
Michael D Kinney 2017-12-28 15:17:31 -08:00 committed by Kinney, Michael D
parent aedd1559cc
commit 12f3447c21
4 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Vlv2TbltDevicePkg/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
AutoPlatformCFG.txt
Stitch/Stitching.log
Stitch/MNW*.bin

8
Vlv2TbltDevicePkg/Build_IFWI.bat
View File

@ -1,7 +1,7 @@
@REM @file @REM @file
@REM Windows batch file to build BIOS ROM @REM Windows batch file to build BIOS ROM
@REM @REM
@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> @REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
@REM This program and the accompanying materials @REM This program and the accompanying materials
@REM are licensed and made available under the terms and conditions of the BSD License @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 @REM which accompanies this distribution. The full text of the license may be found at
@ -131,11 +131,11 @@ if %ERRORLEVEL% NEQ 0 (
echo. echo.
echo Finished Building BIOS. echo Finished Building BIOS.
@REM Set BIOS_ID environment variable here. @REM Set BIOS_ID environment variable here.
call Conf\BiosId.bat call %WORKSPACE%\Conf\BiosId.bat
echo BIOS_ID=%BIOS_ID% echo BIOS_ID=%BIOS_ID%
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables :: 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 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
del /f/q ver_strings >nul del /f/q ver_strings >nul
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
@ -149,7 +149,7 @@ if "%Platform_Type%" == "BYTC" (
pushd %PLATFORM_PACKAGE%\Stitch pushd %PLATFORM_PACKAGE%\Stitch
) )
:: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix] :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix% call IFWIStitch.bat %Stitch_Flags% /B %WORKSPACE%\%BIOS_Name% %IFWI_Suffix%
@echo off @echo off
popd popd

2
Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
View File

@ -191,7 +191,7 @@ for %%i in (%BIOS_Names%) do (
echo Generating IFWI... %BIOS_ID%.bin echo Generating IFWI... %BIOS_ID%.bin
echo. echo.
copy /b/y !IFWI_HEADER_FILE! + ..\..\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin copy /b/y !IFWI_HEADER_FILE! + %WORKSPACE%\Vlv2Binaries\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + %WORKSPACE%\Vlv2Binaries\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin
echo. echo.
echo =========================================================================== echo ===========================================================================
) )

107
Vlv2TbltDevicePkg/bld_vlv.bat
View File

@ -20,8 +20,8 @@ echo.
::********************************************************************** ::**********************************************************************
:: Initial Setup :: Initial Setup
::********************************************************************** ::**********************************************************************
set WORKSPACE=%CD% REM set WORKSPACE=%CD%
if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1% REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%
set /a build_threads=1 set /a build_threads=1
set "Build_Flags= " set "Build_Flags= "
set exitCode=0 set exitCode=0
@ -36,7 +36,7 @@ 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\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\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db 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 :: 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 :: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
@ -48,7 +48,7 @@ set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg REM set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg
::create new AutoPlatformCFG.txt file ::create new AutoPlatformCFG.txt file
copy /y nul %auto_config_inc% >nul copy /y nul %auto_config_inc% >nul
@ -109,17 +109,17 @@ if "%~1"=="" goto Usage
::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\ ::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\
if "%Arch%"=="IA32" ( 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% echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
) else if "%Arch%"=="X64" ( ) 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% echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
) )
:: -- Build flags settings for each Platform -- :: -- Build flags settings for each Platform --
echo Setting %1 platform configuration and BIOS ID... echo Setting %1 platform configuration and BIOS ID...
if /i "%~1" == "MNW2" ( 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% echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
) else ( ) else (
@ -130,10 +130,10 @@ set Platform_Type=%~1
if /i "%~2" == "RELEASE" ( if /i "%~2" == "RELEASE" (
set target=RELEASE set target=RELEASE
echo BUILD_TYPE = R >> Conf\BiosId.env echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env
) else ( ) else (
set target=DEBUG set target=DEBUG
echo BUILD_TYPE = D >> Conf\BiosId.env echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env
) )
::********************************************************************** ::**********************************************************************
@ -141,26 +141,12 @@ if /i "%~2" == "RELEASE" (
::********************************************************************** ::**********************************************************************
echo. echo.
echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013... echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...
if defined VS90COMNTOOLS ( if defined VS140COMNTOOLS (
if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat" if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat"
if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" ( if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" (
set TOOL_CHAIN_TAG=VS2008 set TOOL_CHAIN_TAG=VS2015
) else ( ) else (
set TOOL_CHAIN_TAG=VS2008x86 set TOOL_CHAIN_TAG=VS2015x86
)
) 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 (
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 ( ) else if defined VS120COMNTOOLS (
if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat" if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
@ -169,35 +155,56 @@ if defined VS90COMNTOOLS (
) else ( ) else (
set TOOL_CHAIN_TAG=VS2013x86 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 ( ) else (
echo --ERROR: VS2008/VS2010/VS2012/VS2013 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^! 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 (
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/VS2012/VS2013/VS2015 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS/VS140COMMONTOOLS not defined ^^!
echo. echo.
goto :BldFail goto :BldFail
) )
echo Ensuring correct build directory is present for GenBiosId... 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... echo Modifing Conf files for this build...
:: Remove lines with these tags from target.txt :: 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" ( if "%Arch%"=="IA32" (
echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp
) else if "%Arch%"=="X64" ( ) 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 TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp
echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
if %Source% == 0 ( 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 ( ) 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 :: Build BIOS
@ -205,11 +212,11 @@ move /Y Conf\target.txt.tmp Conf\target.txt >nul
echo Creating BiosId... echo Creating BiosId...
pushd %PLATFORM_PACKAGE% pushd %PLATFORM_PACKAGE%
if not exist ..\%BUILD_PATH%\IA32 mkdir ..\%BUILD_PATH%\IA32 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 GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat
if "%Arch%"=="X64" ( if "%Arch%"=="X64" (
if not exist ..\%BUILD_PATH%\X64 mkdir ..\%BUILD_PATH%\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 GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat
) )
popd popd
@ -230,10 +237,10 @@ echo Running fce...
pushd %PLATFORM_PACKAGE% pushd %PLATFORM_PACKAGE%
:: Extract Hii data from build and store in HiiDefaultData.txt :: Extract Hii data from build and store in HiiDefaultData.txt
fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\HiiDefaultData.txt
:: save changes to VlvXXX.fd :: 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 fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV\HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd
popd popd
@ -241,7 +248,7 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
::echo FD successfully updated with default Hii values. ::echo FD successfully updated with default Hii values.
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables :: 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 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
del /f/q ver_strings >nul del /f/q ver_strings >nul
@ -257,7 +264,11 @@ echo -------------------- The EDKII BIOS build has successfully completed. -----
echo. echo.
@REM build capsule here @REM build capsule here
if "%openssl_path%" == "" goto Exit 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 echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc