AutoPlatformCFG.txt\r
Stitch/Stitching.log\r
Stitch/MNW*.bin\r
+Stitch/MNW*.rom\r
+Stitch/MNW*.rom.orig\r
@REM @file\r
@REM Windows batch file to build BIOS ROM\r
@REM\r
-@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
@REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
@REM\r
\r
set "Build_Flags= "\r
set "Stitch_Flags= "\r
set Arch=X64\r
-set WORKSPACE=%CD%\r
-set CORE_PATH=%WORKSPACE%\edk2\r
-set PLATFORM_PATH=%WORKSPACE%\edk2\r
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
\r
+set PLATFORM_PATH=%WORKSPACE%\r
+if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (\r
+ if defined PACKAGES_PATH (\r
+ for %%i IN (%PACKAGES_PATH%) DO (\r
+ if exist %%~fi\%PLATFORM_PACKAGE% (\r
+ set PLATFORM_PATH=%%~fi\r
+ goto PlatformPackageFound\r
+ )\r
+ )\r
+ ) else (\r
+ echo.\r
+ echo !!! ERROR !!! Cannot find %PLATFORM_PACKAGE% !!!\r
+ echo.\r
+ goto Exit\r
+ )\r
+)\r
+:PlatformPackageFound\r
+\r
:: Parse Optional arguments\r
:OptLoop\r
if /i "%~1"=="/?" goto Usage\r
echo.\r
echo Finished Building BIOS.\r
@REM Set BIOS_ID environment variable here.\r
-call %CORE_PATH%\Conf\BiosId.bat\r
+call %WORKSPACE%\Conf\BiosId.bat\r
echo BIOS_ID=%BIOS_ID%\r
\r
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings\r
+find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings\r
for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
del /f/q ver_strings >nul\r
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
:: Start Integration process\r
echo ======================================================================\r
echo Build_IFWI: Calling IFWI Stitching Script...\r
-pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch\r
+pushd %PLATFORM_PATH%\%PLATFORM_PACKAGE%\Stitch\r
\r
:: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
- call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%\r
+ call IFWIStitch.bat %Stitch_Flags% /B %BIOS_Name% %IFWI_Suffix%\r
\r
@echo off\r
popd\r
@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 - 2019, Intel Corporation. All rights reserved.<BR>\r
@REM \r
@REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
@REM\r
@echo off\r
SetLocal EnableDelayedExpansion EnableExtensions\r
\r
+set PLATFORM_BIN_PACKAGE=%WORKSPACE%\Vlv2SocBinPkg\r
+if not exist %PLATFORM_BIN_PACKAGE% (\r
+ if defined PACKAGES_PATH (\r
+ for %%i IN (%PACKAGES_PATH%) DO (\r
+ if exist %%~fi\Vlv2SocBinPkg (\r
+ set PLATFORM_BIN_PACKAGE=%%~fi\Vlv2SocBinPkg\r
+ goto PlatformBinPackageFound\r
+ )\r
+ )\r
+ ) else (\r
+ echo.\r
+ echo !!! ERROR !!! Cannot find %PLATFORM_NAME% !!!\r
+ echo.\r
+ goto BldFail\r
+ )\r
+)\r
+:PlatformBinPackageFound\r
+\r
+\r
:: Set script defaults\r
set exitCode=0\r
set BackupRom=1\r
echo Generating IFWI... %BIOS_ID%.bin\r
echo.\r
\r
- copy /b/y !IFWI_HEADER_FILE! + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
+ copy /b/y !IFWI_HEADER_FILE! + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin\r
echo.\r
echo ===========================================================================\r
)\r
+++ /dev/null
-@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 SPDX-License-Identifier: BSD-2-Clause-Patent\r
-@REM\r
-\r
-@echo off\r
-@echo.\r
-@time /t\r
-\r
-@if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log\r
-@if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log\r
-@if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt\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
-@if exist conf\.cache rmdir /q /s conf\.cache\r
-\r
-@set target=DEBUG\r
-\r
-@if /i "%1" == "release" set TARGET=RELEASE\r
-@if /i "%2" == "release" set TARGET=RELEASE\r
-@if /i "%3" == "release" set TARGET=RELEASE\r
-@if /i "%4" == "release" set TARGET=RELEASE\r
-@if /i "%5" == "release" set TARGET=RELEASE\r
-\r
-@set PlatformType=NO_PLATFORM\r
-@set config_file=.\Vlv2TbltDevicePkg\PlatformPkgConfig.dsc\r
-@set EVN_debug_file=.\Vlv2TbltDevicePkg\BiosIdx64D.env\r
-@set EVN_release_file=.\Vlv2TbltDevicePkg\BiosIdx64R.env\r
-@set auto_config_inc=.\Vlv2TbltDevicePkg\AutoPlatformCFG.txt\r
-\r
-@if "%1" == "MNW2" (\r
- set %PlatformType% = MNW2\r
- @echo Setting Baley Bay platform configration and BIOS ID ...\r
- findstr /b /v BOARD_ID %EVN_debug_file% > newfile.env\r
- echo BOARD_ID = MNW2MAX >> newfile.env\r
- type newfile.env > %EVN_debug_file%\r
- findstr /b /v BOARD_ID %EVN_release_file% > newfile.env\r
- echo BOARD_ID = MNW2MAX >> newfile.env\r
- type newfile.env > %EVN_release_file%\r
- echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%\r
- echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%\r
- goto PLATFORM_SETTING_DONE\r
-) \r
-\r
-@if "%PlatformType%" == "NO_PLATFORM" (\r
- goto BldFail\r
-)\r
-\r
-rem clearup the temp file\r
-:PLATFORM_SETTING_DONE\r
-@DEL NEWFILE.ENV\r
-@DEL NEWFILE.CFG\r
-\r
-@REM Define platform specific environment variables.\r
-@REM\r
-@set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
-@set SCRIPT_ERROR=0\r
-\r
-@REM Set basic environment.\r
-@echo.\r
-@echo Run edksetup.bat batch file.\r
-@echo.\r
-@del Conf\build_rule.txt\r
-@REM @del Conf\tools_def.txt\r
-@call edksetup.bat\r
-\r
-\r
-@echo.\r
-@echo Set the VS2008 environment.\r
-@echo.\r
-@if defined VS90COMNTOOLS (\r
- if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"\r
- if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (\r
- set TOOL_CHAIN_TAG=VS2008\r
- ) else (\r
- set TOOL_CHAIN_TAG=VS2008x86\r
- )\r
-) else (\r
- echo.\r
- echo !!! ERROR !!! VS2008 not installed correctly. VS90COMNTOOLS not defined. !!!\r
- echo.\r
- set SCRIPT_ERROR=1\r
- goto :BldEnd\r
-)\r
-\r
-@echo.\r
-@echo Set build environment.\r
-@echo.\r
-@if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG% (\r
- mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\r
-)\r
-\r
-\r
-@REM Set clean build option\r
-@set CLEAN_BUILD_OPTION=-e\r
-\r
-@findstr /V "ACTIVE_PLATFORM TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF" Conf\target.txt > Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-\r
-@echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkgX64.dsc >> Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-@echo TARGET = %TARGET% >> Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-@echo TARGET_ARCH = IA32 X64 >> Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-@echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-@echo BUILD_RULE_CONF = Conf/build_rule.txt >> Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt\r
-@move /Y Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt Conf\r
-\r
-\r
-\r
-@echo.\r
-@echo Create BiosIdx64.\r
-@echo.\r
-@if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64 (\r
- mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64\r
-)\r
-\r
-@if "%TARGET%" == "DEBUG" (\r
- set BIOS_ID_FILE=BiosIdx64D.env\r
-\r
-) else (\r
- set BIOS_ID_FILE=BiosIdx64R.env\r
-\r
-)\r
-\r
-\r
-GenBiosId.exe -i %PLATFORM_PACKAGE%\%BIOS_ID_FILE% -o Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64\BiosId.bin\r
-@if %ERRORLEVEL% NEQ 0 goto BldFail\r
-\r
-@echo off\r
-echo Copy reference code ASL files.\r
-\r
-\r
-@if /i "/s" == "%1" goto BldSilent\r
-@if /i "/s" == "%2" goto BldSilent\r
-@if /i "/s" == "%3" goto BldSilent\r
-@if /i "/s" == "%4" goto BldSilent\r
-@if /i "/s" == "%5" goto BldSilent\r
-\r
-build -n %NUMBER_OF_PROCESSORS%\r
-@if %ERRORLEVEL% NEQ 0 goto BldFail\r
-\r
-@If %SCRIPT_ERROR% EQU 1 goto BldFail\r
-@goto BldSuccess\r
-\r
-:BldSilent\r
-\r
-build -n %NUMBER_OF_PROCESSORS% 1>>EDK2.log 2>&1\r
-@if %ERRORLEVEL% NEQ 0 goto BldFail\r
-\r
-\r
-@If %SCRIPT_ERROR% EQU 1 goto BldFail\r
-\r
-:BldSuccess\r
-@echo off\r
-del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforeconfig.fd 1>>EDK2.log 2>&1\r
-del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\HiiDefaultData.txt 1>>EDK2.log 2>&1\r
-copy /y Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\Vlv.fd Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforeconfig.fd 1>>EDK2.log 2>&1\r
-\r
-@echo.\r
-@echo Extract setup default value from VFR (Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\HiiDefaultData.txt)\r
-@echo.\r
-fce read -i Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforeconfig.fd > Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\HiiDefaultData.txt\r
-\r
-\r
-@echo Update FD with default Hii value successfully! (both 'Setup' and 'SetupDefault')\r
-@echo.\r
-fce mirror -i Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforeconfig.fd -o Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.fd Setup SetupDefault 1>>EDK2.log 2>&1\r
-\r
-@echo off\r
-del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\Vlv.fd\r
-del Vlv2TbltDevicePkg\RomImage\bios.rom\r
-if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM goto Gen8MImage\r
-del /q /f Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\*\r
-rd /Q Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\r
-:Gen8MImage\r
-\r
-copy /b Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.fd Vlv2TbltDevicePkg\RomImage\bios.rom\r
-\r
-pushd Vlv2TbltDevicePkg\RomImage\\r
-@if "%TARGET%" == "DEBUG" (\r
- call signbiosX64_debug.bat\r
-) else (\r
- call signbiosX64_release.bat\r
-)\r
-\r
-call ftoolbuild.bat\r
-call ftoolbuild_sec_enable.bat\r
-popd\r
-\r
-@echo off\r
-mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\r
-move Vlv2TbltDevicePkg\RomImage\SPI_Image\* Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\ > NUL\r
-\r
-call GenBIOS.bat X64\r
-\r
-@echo on\r
-\r
-@echo TARGET: %TARGET%\r
-@echo TOOL_CHAIN_TAG: %TOOL_CHAIN_TAG%\r
-@echo BIOS location: Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\r
-@echo SPI Images location: Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\r
-@echo.\r
-@echo The EDKII BIOS build has successfully completed!\r
-@echo.\r
-@goto BldEnd\r
-\r
-:BldFail\r
-@echo.\r
-@echo The EDKII BIOS Build has failed!\r
-@echo.\r
-exit /b 1\r
-\r
-:BldEnd\r
-@time /t\r
-exit /b 0\r
@REM @file\r
@REM Windows batch file to build BIOS ROM\r
@REM\r
-@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
@REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
@REM\r
\r
::**********************************************************************\r
:: Initial Setup\r
::**********************************************************************\r
-set WORKSPACE=%CD%\r
if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%\r
set /a build_threads=1\r
set "Build_Flags= "\r
set exitCode=0\r
set Arch=X64\r
set Source=0\r
-set CORE_PATH=%WORKSPACE%\edk2\r
-set PLATFORM_PATH=%WORKSPACE%\edk2\r
-cd ./edk2\r
+set PLATFORM_NAME=Vlv2TbltDevicePkg\r
+\r
+set CORE_PATH=%WORKSPACE%\r
+if not exist %CORE_PATH%\edksetup.bat (\r
+ if defined PACKAGES_PATH (\r
+ for %%i IN (%PACKAGES_PATH%) DO (\r
+ if exist %%~fi\edksetup.bat (\r
+ set CORE_PATH=%%~fi\r
+ goto CorePathFound\r
+ )\r
+ )\r
+ ) else (\r
+ echo.\r
+ echo !!! ERROR !!! Cannot find edksetup.bat !!!\r
+ echo.\r
+ goto BldFail\r
+ )\r
+)\r
+:CorePathFound\r
+\r
+set PLATFORM_PACKAGE=%WORKSPACE%\%PLATFORM_NAME%\r
+if not exist %PLATFORM_PACKAGE% (\r
+ if defined PACKAGES_PATH (\r
+ for %%i IN (%PACKAGES_PATH%) DO (\r
+ if exist %%~fi\%PLATFORM_NAME% (\r
+ set PLATFORM_PACKAGE=%%~fi\%PLATFORM_NAME%\r
+ goto PlatformPackageFound\r
+ )\r
+ )\r
+ ) else (\r
+ echo.\r
+ echo !!! ERROR !!! Cannot find %PLATFORM_NAME% !!!\r
+ echo.\r
+ goto BldFail\r
+ )\r
+)\r
+:PlatformPackageFound\r
+\r
+cd %CORE_PATH%\r
\r
:: Clean up previous build files.\r
-if exist %CORE_PATH%\edk2.log del %CORE_PATH%\edk2.log\r
-if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log\r
-if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt\r
-if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt\r
-if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.txt\r
-if exist conf\.cache rmdir /q/s conf\.cache\r
+if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log\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
+if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt\r
+if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache\r
\r
:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf\r
:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding\r
@echo off\r
\r
:: Define platform specific environment variables.\r
-set PLATFORM_NAME=Vlv2TbltDevicePkg\r
-set PLATFORM_PACKAGE=%PLATFORM_PATH%\Vlv2TbltDevicePkg\r
set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc\r
set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt\r
\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 > nul\r
- rmdir /s/q conf\.cache\r
+ if exist %WORKSPACE%\Conf\.cache (\r
+ del /f/s/q %WORKSPACE%\Conf\.cache > nul\r
+ rmdir /s/q %WORKSPACE%\Conf\.cache\r
)\r
echo.\r
shift\r
\r
::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\\r
if "%Arch%"=="IA32" (\r
- findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > Conf\BiosId.env\r
+ findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%\r
) else if "%Arch%"=="X64" (\r
- findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > Conf\BiosId.env\r
+ findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%\r
)\r
\r
:: -- Build flags settings for each Platform --\r
echo Setting %1 platform configuration and BIOS ID...\r
if /i "%~1" == "MNW2" (\r
- echo BOARD_ID = MNW2MAX >> Conf\BiosId.env\r
+ echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%\r
\r
) else (\r
\r
if /i "%~2" == "RELEASE" (\r
set target=RELEASE\r
- echo BUILD_TYPE = R >> Conf\BiosId.env\r
+ echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env\r
) else (\r
set target=DEBUG\r
- echo BUILD_TYPE = D >> Conf\BiosId.env\r
+ echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env\r
)\r
\r
::**********************************************************************\r
)\r
\r
echo Ensuring correct build directory is present for GenBiosId...\r
-set BUILD_PATH=Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\r
+set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\r
\r
echo Modifing Conf files for this build...\r
:: Remove lines with these tags from target.txt\r
-findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp\r
+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\r
\r
-echo TARGET = %TARGET% >> Conf\target.txt.tmp\r
+echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp\r
if "%Arch%"=="IA32" (\r
- echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp\r
+ echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp\r
) else if "%Arch%"=="X64" (\r
- echo TARGET_ARCH = IA32 X64 >> Conf\target.txt.tmp\r
+ echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp\r
)\r
-echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Conf\target.txt.tmp\r
-echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp\r
+echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp\r
+echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp\r
if %Source% == 0 (\r
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> Conf\target.txt.tmp\r
+ echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp\r
) else (\r
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> Conf\target.txt.tmp\r
+ echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp\r
)\r
-echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> Conf\target.txt.tmp\r
+echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp\r
\r
-move /Y Conf\target.txt.tmp Conf\target.txt >nul\r
+move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul\r
\r
::**********************************************************************\r
:: Build BIOS\r
::**********************************************************************\r
\r
echo Creating BiosId...\r
-pushd %PLATFORM_PACKAGE%\r
-if not exist %WORKSPACE%\%BUILD_PATH%\IA32 mkdir %WORKSPACE%\%BUILD_PATH%\IA32\r
- GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\IA32\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat\r
+if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32\r
+%PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
if "%Arch%"=="X64" (\r
- if not exist %WORKSPACE%\%BUILD_PATH%\X64 mkdir %WORKSPACE%\%BUILD_PATH%\X64\r
- GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\X64\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat\r
+ if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64\r
+ %PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
)\r
-popd\r
-\r
\r
if %ERRORLEVEL% NEQ 0 goto BldFail\r
\r
\r
pushd %PLATFORM_PACKAGE%\r
:: Extract Hii data from build and store in HiiDefaultData.txt\r
-fce read -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd > %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt\r
+%PLATFORM_PACKAGE%\fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\HiiDefaultData.txt\r
\r
:: save changes to VlvXXX.fd\r
-fce update -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd -s %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt -o %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd\r
+%PLATFORM_PACKAGE%\fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV\HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd\r
popd\r
\r
if %ERRORLEVEL% NEQ 0 goto BldFail\r
::echo FD successfully updated with default Hii values.\r
\r
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" Conf\BiosId.env > ver_strings\r
+find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings\r
for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
del /f/q ver_strings >nul\r
\r
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
-copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PATH%\%BIOS_Name% >nul\r
-copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BUILD_PATH%\FV\Vlv.ROM >nul\r
+copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PACKAGE%\Stitch\%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
echo.\r
\r
@REM build capsule here\r
-@REMif "%openssl_path%" == "" (\r
-@REM echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated.\r
-@REM set exitCode=1\r
-@REM goto Exit\r
-@REM\r
-@REM echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
-@REM build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
+echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
+build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
\r
goto Exit\r
\r
BOARD_ID=$(grep '^BOARD_ID' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-7)
BIOS_Name="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR".ROM
BIOS_ID="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"_GCC.bin
-cp -f $BUILD_PATH/FV/VLV.fd $WORKSPACE/$BIOS_Name
SEC_VERSION=1.0.2.1060v5
-cat $IFWI_HEADER_FILE ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/Vacant.bin $BIOS_Name > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID
+cat $IFWI_HEADER_FILE ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/Vacant.bin $BUILD_PATH/FV/VLV.fd > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID
echo Skip "Running BIOS_Signing ..."